X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Fvpp.yaml;h=f160cc442224a3c12de43e5c6ca11a8b611b9ec2;hb=29be786d3165364f61fadadf0fba430c2f377018;hp=54418622bacda45ea1d73a44c05995fe58e05a10;hpb=19d5ed63e66867da22d146c1cf6b62fda5670f72;p=ci-management.git

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 54418622b..f160cc442 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -4,12 +4,6 @@
     jobs:
         - 'vpp-verify-{stream}-{os}'
         - 'vpp-merge-{stream}-{os}'
-        - 'vpp-verify-os-{stream}-{os}'
-        - 'vpp-merge-os-{stream}-{os}'
-        - 'vpp-docs-merge-{stream}'
-        - 'vpp-docs-verify-{stream}'
-        - 'vpp-make-test-docs-merge-{stream}'
-        - 'vpp-make-test-docs-verify-{stream}'
 
     project: 'vpp'
     os:
@@ -17,71 +11,111 @@
           repo-os-part: 'ubuntu.xenial.main'
       - centos7:
           repo-os-part: 'centos7'
-      - opensuse:
-          repo-os-part: 'opensuse'
 
     stream:
         - master:
             branch: 'master'
             repo-stream-part: 'master'
-        - '1710':
-            branch: 'stable/1710'
-            repo-stream-part: 'stable.1710'
         - '1801':
             branch: 'stable/1801'
             repo-stream-part: 'stable.1801'
+        - '1804':
+            branch: 'stable/1804'
+            repo-stream-part: 'stable.1804'
+        - '1807':
+            branch: 'stable/1807'
+            repo-stream-part: 'stable.1807'
     type:
         - short
         - long
 
+- project:
+    name: vpp-clang
+    jobs:
+        - 'vpp-verify-{stream}-clang'
+
+    project: 'vpp'
+    os:
+      - ubuntu1604:
+          repo-os-part: 'ubuntu.xenial.main'
+      - centos7:
+          repo-os-part: 'centos7'
+      - opensuse:
+          repo-os-part: 'opensuse'
+
+    stream:
+        - master:
+            branch: 'master'
+            repo-stream-part: 'master'
+
 - project:
     name: vpp-misc
     jobs:
         - 'vpp-csit-verify-virl-{stream}'
-        - 'vpp-csit-verify-os-virl-{stream}'
-        - 'vpp-csit-verify-hw-perf-{stream}'
+        - 'vpp-checkstyle-verify-{stream}'
     project: 'vpp'
     stream:
         - master:
             branch: 'master'
             repo-stream-part: 'master'
-        - '1710':
-            branch: 'stable/1710'
-            repo-stream-part: 'stable.1710'
         - '1801':
             branch: 'stable/1801'
             repo-stream-part: 'stable.1801'
+        - '1804':
+            branch: 'stable/1804'
+            repo-stream-part: 'stable.1804'
+        - '1807':
+            branch: 'stable/1807'
+            repo-stream-part: 'stable.1807'
+    os: ubuntu1604
+
+- project:
+    name: vpp-perpatch
+    jobs:
+        - 'vpp-csit-verify-perf-{stream}-2n-skx'
+    project: 'vpp'
+    stream:
+        - master:
+            branch: 'master'
+            repo-stream-part: 'master'
     os: ubuntu1604
 
 - project:
-    name: vpp-beta
+    name: vpp-master-only
     jobs:
         - 'vpp-beta-verify-{stream}-{os}'
+        - 'vpp-beta-merge-{stream}-{os}'
     project: 'vpp'
     stream:
         - master:
             branch: 'master'
             repo-stream-part: 'master'
+        - '1807':
+            branch: 'stable/1807'
+            repo-stream-part: 'stable.1807'
     os:
       - ubuntu1804:
           repo-os-part: 'ubuntu.bionic.main'
-      - osleap15:
-          repo-os-part: 'osleap15'
-      - osleap423:
-          repo-os-part: 'osleap423'
 
 - project:
     name: vpp-arm
     jobs:
         - 'vpp-arm-verify-{stream}-{os}'
+        - 'vpp-arm-merge-{stream}-{os}'
     project: 'vpp'
     stream:
         - master:
             branch: 'master'
             repo-stream-part: 'master'
+        - '1804':
+            branch: 'stable/1804'
+            repo-stream-part: 'stable.1804'
+        - '1807':
+            branch: 'stable/1807'
+            repo-stream-part: 'stable.1807'
     os:
       - ubuntu1604:
-          repo-os-part: 'ubuntu.xenial.main'
+          repo-os-part: 'ubuntu-arm.xenial.main'
 
 - job-template:
     name: 'vpp-beta-verify-{stream}-{os}'
@@ -90,80 +124,13 @@
     node: '{os}-us'
     concurrent: true
     triggers:
-        - gerrit:
-            server-name: 'Primary'
-            trigger-on:
-                - patchset-uploaded-event: 'false'
-                - comment-added-contains-event:
-                    comment-contains-value: 'betacheck'
-            projects:
-                - project-compare-type: 'ANT'
-                  project-pattern: '{project}'
-                  branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**/{branch}'
-            skip-vote:
-                successful: true
-                failed: true
-                unstable: true
-                notbuilt: true
-            override-votes: true
-            gerrit-build-notbuilt-verified-value: 0
-            notbuilt-message: 'Automatic retry of failed jobs may be in process. A proper vote should be set when retry completes.'
-
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameter:
+        - gerrit-trigger-checkstyle:
+            name: '{project}'
             branch: '{branch}'
-        - os-parameter:
-            os: '{os}'
-        - repo-name-parameter:
-            repo-name: '{repo-stream-part}.{repo-os-part}'
-
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: 'jenkins-gerrit-credentials'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
-
-    wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
-
-    builders:
-        - shell:
-            !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
-        - shell:
-            !include-raw-escape:
-                - include-raw-vpp-build.sh
-    publishers:
-        - archive:
-            artifacts: 'build-root/*.rpm,build-root/*.deb,dpdk/*.rpm,dpdk/*.deb'
-            allow-empty: 'true'
-            fingerprint: false
-            only-if-success: true
-            default-excludes: false
-        - fdio-infra-shiplogs:
-            maven-version: 'mvn33-new'
-            archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
-
-- job-template:
-    name: 'vpp-arm-verify-{stream}-{os}'
-
-    project-type: freestyle
-    node: '{os}arm-us'
-    concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        numToKeep: 100
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
@@ -176,6 +143,8 @@
             os: '{os}'
         - repo-name-parameter:
             repo-name: '{repo-stream-part}.{repo-os-part}'
+        - stream-parameter:
+            stream: '{stream}'
 
     scm:
         - gerrit-trigger-scm:
@@ -187,29 +156,7 @@
         - fdio-infra-wrappers:
             build-timeout: '{build-timeout}'
 
-    triggers:
-        - gerrit:
-            server-name: 'Primary'
-            trigger-on:
-                - comment-added-contains-event:
-                    comment-contains-value: 'armcheck'
-            projects:
-                - project-compare-type: 'ANT'
-                  project-pattern: '{project}'
-                  branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**/{branch}'
-            skip-vote:
-                successful: true
-                failed: true
-                unstable: true
-                notbuilt: true
-
     builders:
-        - shell:
-            !include-raw-escape: include-raw-vpp-checkstyle.sh
-        - shell:
-            !include-raw-escape: include-raw-vpp-test-checkstyle.sh
         - shell:
             !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
         - shell:
@@ -226,17 +173,20 @@
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
             archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
+        - naginator:
+            rerun-unstable-builds: false
+            max-failed-builds: 1
+            fixed-delay: 90
 
 - job-template:
-    name: 'vpp-verify-{stream}-{os}'
+    name: 'vpp-beta-merge-{stream}-{os}'
 
     project-type: freestyle
     node: '{os}-us'
-    concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        numToKeep: 100
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
@@ -247,35 +197,64 @@
             branch: '{branch}'
         - os-parameter:
             os: '{os}'
+        - maven-project-parameter:
+            maven: 'mvn33-new'
+        - maven-exec:
+            maven-version: 'mvn33-new'
+        - stream-parameter:
+            stream: '{stream}'
         - repo-name-parameter:
             repo-name: '{repo-stream-part}.{repo-os-part}'
 
     scm:
         - gerrit-trigger-scm:
             credentials-id: 'jenkins-gerrit-credentials'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+            refspec: ''
+            choosing-strategy: 'default'
 
     wrappers:
         - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
+            build-timeout: 120
 
     triggers:
-        - gerrit-trigger-trivial-patch-submitted:
+        - gerrit-trigger-patch-merged:
             name: '{project}'
             branch: '{branch}'
 
     builders:
-        - shell:
-            !include-raw-escape: include-raw-vpp-checkstyle.sh
-        - shell:
-            !include-raw-escape: include-raw-vpp-test-checkstyle.sh
+        - config-file-provider:
+            files:
+              - file-id: '.packagecloud'
+                target: '/root'
+        - config-file-provider:
+            files:
+              - file-id: 'packagecloud_api'
+                target: '/root'
+        - maven-target:
+            maven-version: 'mvn33-new'
+            goals: '--version'
+            settings: 'vpp-settings'
+            settings-type: cfp
+            global-settings: 'global-settings'
+            global-settings-type: cfp
         - shell:
             !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
         - shell:
             !include-raw-escape:
                 - ../scripts/setup_vpp_dpdk_dev_env.sh
                 - include-raw-vpp-build.sh
+        - provide-maven-settings:
+            settings-file: 'vpp-settings'
+            global-settings-file: 'global-settings'
+        - shell:
+            !include-raw-escape:
+                - ../scripts/packagecloud_push.sh
+        - shell:
+            !include-raw-escape:
+                - ../scripts/maven_push_functions.sh
+                - include-raw-vpp-maven-push.sh
+
+
     publishers:
         - archive:
             artifacts: 'build-root/*.rpm,build-root/*.deb,dpdk/*.rpm,dpdk/*.deb'
@@ -285,22 +264,17 @@
             default-excludes: false
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
-            archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
-        - naginator:
-            rerun-unstable-builds: true
-            max-failed-builds: 1
-            fixed-delay: 10
 
 - job-template:
-    name: 'vpp-verify-os-{stream}-{os}'
+    name: 'vpp-arm-verify-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-8c-32g'
+    node: '{os}arm-us'
     concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        numToKeep: 100
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
@@ -313,6 +287,8 @@
             os: '{os}'
         - repo-name-parameter:
             repo-name: '{repo-stream-part}.{repo-os-part}'
+        - stream-parameter:
+            stream: '{stream}'
 
     scm:
         - gerrit-trigger-scm:
@@ -322,25 +298,21 @@
 
     wrappers:
         - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
+            build-timeout: 120
 
     triggers:
-        - gerrit-trigger-os-trivial-patch-submitted:
+        - gerrit-trigger-checkstyle:
             name: '{project}'
             branch: '{branch}'
 
     builders:
         - shell:
-            !include-raw-escape: include-raw-vpp-checkstyle.sh
-        - shell:
-            !include-raw-escape: include-raw-vpp-test-checkstyle.sh
-        - shell:
-            !include-raw-escape:
-                - ../scripts/setup_vpp_ubuntu_docker_test.sh
+            !include-raw-escape: ../scripts/setup_vpp_ubuntu_arm_test.sh
         - shell:
             !include-raw-escape:
                 - ../scripts/setup_vpp_dpdk_dev_env.sh
-                - include-raw-vpp-build.sh
+                - include-raw-vpp-parallel-vars.sh
+                - include-raw-vpp-arm-build.sh
     publishers:
         - archive:
             artifacts: 'build-root/*.rpm,build-root/*.deb,dpdk/*.rpm,dpdk/*.deb'
@@ -353,14 +325,14 @@
             archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
 
 - job-template:
-    name: 'vpp-merge-{stream}-{os}'
+    name: 'vpp-arm-merge-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-us'
+    node: '{os}arm-us'
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        numToKeep: 100
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
@@ -388,7 +360,7 @@
 
     wrappers:
         - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
+            build-timeout: 120
 
     triggers:
         - gerrit-trigger-patch-merged:
@@ -399,11 +371,11 @@
         - config-file-provider:
             files:
               - file-id: '.packagecloud'
-                target: '/home/jenkins'
+                target: '/root'
         - config-file-provider:
             files:
               - file-id: 'packagecloud_api'
-                target: '/home/jenkins'
+                target: '/root'
         - maven-target:
             maven-version: 'mvn33-new'
             goals: '--version'
@@ -411,24 +383,22 @@
             settings-type: cfp
             global-settings: 'global-settings'
             global-settings-type: cfp
-        - shell:
-            !include-raw-escape: include-raw-vpp-checkstyle.sh
         - shell:
             !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
         - shell:
             !include-raw-escape:
                 - ../scripts/setup_vpp_dpdk_dev_env.sh
-                - include-raw-vpp-build.sh
+                - include-raw-vpp-arm-build.sh
         - provide-maven-settings:
             settings-file: 'vpp-settings'
             global-settings-file: 'global-settings'
         - shell:
             !include-raw-escape:
-                - ../scripts/maven_push_functions.sh
-                - include-raw-vpp-maven-push.sh
+                - ../scripts/packagecloud_push.sh
         - shell:
             !include-raw-escape:
-                - ../scripts/packagecloud_push.sh
+                - ../scripts/maven_push_functions.sh
+                - include-raw-vpp-maven-push.sh
 
     publishers:
         - archive:
@@ -439,18 +409,15 @@
             default-excludes: false
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
-        - naginator:
-            rerun-unstable-builds: true
-            max-failed-builds: 1
-            fixed-delay: 10
 
 - job-template:
-    name: 'vpp-merge-os-{stream}-{os}'
+    name: 'vpp-checkstyle-verify-{stream}'
 
     project-type: freestyle
-    node: '{os}-basebuild-8c-32g'
+    node: '{os}-us'
+    concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -463,86 +430,88 @@
             branch: '{branch}'
         - os-parameter:
             os: '{os}'
-        - maven-project-parameter:
-            maven: 'mvn33-new'
-        - maven-exec:
-            maven-version: 'mvn33-new'
-        - stream-parameter:
-            stream: '{stream}'
         - repo-name-parameter:
-            repo-name: '{repo-stream-part}.{repo-os-part}'
+            repo-name: '{repo-stream-part}.ubuntu.xenial.main'
 
     scm:
         - gerrit-trigger-scm:
             credentials-id: 'jenkins-gerrit-credentials'
-            refspec: ''
-            choosing-strategy: 'default'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
 
     wrappers:
         - fdio-infra-wrappers:
             build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-os-patch-merged:
-            name: '{project}'
-            branch: '{branch}'
+        - gerrit:
+            server-name: 'Primary'
+            trigger-on:
+                - patchset-created-event:
+                    exclude-drafts: 'true'
+                    exclude-trivial-rebase: 'false'
+                    exclude-no-code-change: 'true'
+                - draft-published-event
+                - comment-added-contains-event:
+                    comment-contains-value: 'checkstylecheck'
+                - comment-added-contains-event:
+                    comment-contains-value: 'docsonly'
+                - comment-added-contains-event:
+                    comment-contains-value: 'recheck'
+                - comment-added-contains-event:
+                    comment-contains-value: 'reverify'
+            projects:
+                - project-compare-type: 'ANT'
+                  project-pattern: '{project}'
+                  branches:
+                    - branch-compare-type: 'ANT'
+                      branch-pattern: '**/{branch}'
+                  file-paths:
+                    - compare-type: REG_EXP
+                      pattern: ^((?!\/COMMIT_MSG|docs|_abc|_def[\/\.]).)*$
+                  forbidden-file-paths:
+                    - compare-type: REG_EXP
+                      pattern: .*docs\/.*
+                    - compare-type: REG_EXP
+                      pattern: .*extras\/emacs\/.*
+                  disable-strict-forbidden-file-verification: 'true'
+            override-votes: true
+            gerrit-build-notbuilt-verified-value: 0
+            gerrit-build-successful-verified-value: 1
+            notbuilt-message: 'Automatic retry of failed jobs may be in process. A proper vote should be set when retry completes.'
+            failed-message: 'Checkstyle failed. No further verify jobs will be started.'
+            successful-message: 'checkstyle_success'
+            skip-vote:
+                successful: true
+                failed: false
+                unstable: false
+                notbuilt: false
 
     builders:
-        - config-file-provider:
-            files:
-              - file-id: '.packagecloud'
-                target: '/home/jenkins'
-        - config-file-provider:
-            files:
-              - file-id: 'packagecloud_api'
-                target: '/home/jenkins'
-        - maven-target:
-            maven-version: 'mvn33-new'
-            goals: '--version'
-            settings: 'vpp-settings'
-            settings-type: cfp
-            global-settings: 'global-settings'
-            global-settings-type: cfp
         - shell:
             !include-raw-escape: include-raw-vpp-checkstyle.sh
         - shell:
-            !include-raw-escape:
-                - ../scripts/setup_vpp_ubuntu_docker_test.sh
-        - shell:
-            !include-raw-escape:
-                - ../scripts/setup_vpp_dpdk_dev_env.sh
-                - include-raw-vpp-build.sh
-        - provide-maven-settings:
-            settings-file: 'vpp-settings'
-            global-settings-file: 'global-settings'
-        - shell:
-            !include-raw-escape:
-                - ../scripts/maven_push_functions.sh
-                - include-raw-vpp-maven-push.sh
-        - shell:
-            !include-raw-escape:
-                - ../scripts/packagecloud_push.sh
+            !include-raw-escape: include-raw-vpp-test-checkstyle.sh
 
     publishers:
-        - archive:
-            artifacts: 'build-root/*.rpm,build-root/*.deb,dpdk/*.rpm,dpdk/*.deb'
-            allow-empty: 'true'
-            fingerprint: false
-            only-if-success: true
-            default-excludes: false
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
+            archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
+        - naginator:
+            rerun-unstable-builds: true
+            max-failed-builds: 1
+            fixed-delay: 90
 
 - job-template:
-    name: 'vpp-csit-verify-virl-{stream}'
+    name: 'vpp-verify-{stream}-{os}'
 
     project-type: freestyle
     node: '{os}-us'
     concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        numToKeep: 100
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
@@ -554,12 +523,9 @@
         - os-parameter:
             os: '{os}'
         - repo-name-parameter:
-            repo-name: '{repo-stream-part}.ubuntu.xenial.main'
-        - is-csit-vpp-job-parameter:
-            is-csit-vpp-job: 'True'
-        - string:
-            name: CSIT_REF
-            description: "Also testing CSIT_REF"
+            repo-name: '{repo-stream-part}.{repo-os-part}'
+        - stream-parameter:
+            stream: '{stream}'
 
     scm:
         - gerrit-trigger-scm:
@@ -569,54 +535,43 @@
 
     wrappers:
         - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
+            build-timeout: 120
 
     triggers:
-        - gerrit-trigger-trivial-patch-submitted:
+        - gerrit-trigger-checkstyle:
             name: '{project}'
             branch: '{branch}'
 
     builders:
-        - shell: 'echo "VPP_BRANCH={branch}" > $WORKSPACE/variables.prop'
-        - inject:
-            properties-file: variables.prop
         - shell:
-            !include-raw-escape:
-                - include-raw-vpp-checkstyle.sh
+            !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
         - shell:
             !include-raw-escape:
-                - ../scripts/setup_vpp_ubuntu_docker_test.sh
                 - ../scripts/setup_vpp_dpdk_dev_env.sh
                 - include-raw-vpp-build.sh
-        - shell:
-            !include-raw-escape:
-                - include-raw-vpp-csit-functional.sh
-
     publishers:
-        - archive-artifacts:
-            artifacts: 'csit/report.html, csit/log.html, csit/output.xml'
-            latest-only: false
-
-        - robot-report:
-            output-path: 'csit'
-
+        - archive:
+            artifacts: 'build-root/*.rpm,build-root/*.deb,dpdk/*.rpm,dpdk/*.deb'
+            allow-empty: 'true'
+            fingerprint: false
+            only-if-success: true
+            default-excludes: false
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
-
+            archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
         - naginator:
-            rerun-unstable-builds: true
-            max-failed-builds: 1
-            fixed-delay: 10
-
+            rerun-unstable-builds: false
+            max-failed-builds: 2
+            fixed-delay: 90
 
 - job-template:
-    name: 'vpp-csit-verify-os-virl-{stream}'
+    name: 'vpp-verify-{stream}-clang'
 
     project-type: freestyle
-    node: '{os}-basebuild-8c-32g'
+    node: 'ubuntu1604-us'
     concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -628,14 +583,11 @@
         - gerrit-parameter:
             branch: '{branch}'
         - os-parameter:
-            os: '{os}'
+            os: 'ubuntu1604'
         - repo-name-parameter:
             repo-name: '{repo-stream-part}.ubuntu.xenial.main'
-        - is-csit-vpp-job-parameter:
-            is-csit-vpp-job: 'True'
-        - string:
-            name: CSIT_REF
-            description: "Also testing CSIT_REF"
+        - stream-parameter:
+            stream: '{stream}'
 
     scm:
         - gerrit-trigger-scm:
@@ -648,47 +600,35 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-os-trivial-patch-submitted:
+        - gerrit-trigger-checkstyle:
             name: '{project}'
             branch: '{branch}'
 
     builders:
-        - shell: 'echo "VPP_BRANCH={branch}" > $WORKSPACE/variables.prop'
-        - inject:
-            properties-file: variables.prop
         - shell:
-            !include-raw-escape:
-                - include-raw-vpp-checkstyle.sh
+            !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
         - shell:
             !include-raw-escape:
-                - ../scripts/setup_vpp_ubuntu_docker_test.sh
                 - ../scripts/setup_vpp_dpdk_dev_env.sh
-                - include-raw-vpp-build.sh
-        - shell:
-            !include-raw-escape:
-                - include-raw-vpp-csit-functional.sh
-
+                - include-raw-vpp-clang-build.sh
     publishers:
-        - archive-artifacts:
-            artifacts: 'csit/report.html, csit/log.html, csit/output.xml'
-            latest-only: false
-
-        - robot-report:
-            output-path: 'csit'
-
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
+            archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
+        - naginator:
+            rerun-unstable-builds: false
+            max-failed-builds: 1
+            fixed-delay: 90
 
 - job-template:
-    name: 'vpp-csit-verify-hw-perf-{stream}'
+    name: 'vpp-merge-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-basebuild-8c-32g'
-    concurrent: false
+    node: '{os}-us'
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        numToKeep: 100
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
@@ -699,126 +639,39 @@
             branch: '{branch}'
         - os-parameter:
             os: '{os}'
-        - repo-name-parameter:
-            repo-name: '{repo-stream-part}.ubuntu.xenial.main'
-        - is-csit-vpp-job-parameter:
-            is-csit-vpp-job: 'True'
-
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: 'jenkins-gerrit-credentials'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
-
-    wrappers:
-        - fdio-infra-wrappers-non-activity-timeout:
-            build-timeout: 30
-
-    triggers:
-        - gerrit:
-            server-name: 'Primary'
-            trigger-on:
-                - comment-added-contains-event:
-                    comment-contains-value: 'vpp-verify-perf-l2'
-                - comment-added-contains-event:
-                    comment-contains-value: 'vpp-verify-perf-ip4'
-                - comment-added-contains-event:
-                    comment-contains-value: 'vpp-verify-perf-ip6'
-                - comment-added-contains-event:
-                    comment-contains-value: 'vpp-verify-perf-lisp'
-                - comment-added-contains-event:
-                    comment-contains-value: 'vpp-verify-perf-vxlan'
-                - comment-added-contains-event:
-                    comment-contains-value: 'vpp-verify-perf-vhost'
-                - comment-added-contains-event:
-                    comment-contains-value: 'vpp-verify-perf-acl'
-                - comment-added-contains-event:
-                    comment-contains-value: 'vpp-verify-perf-memif'
-                - comment-added-contains-event:
-                    comment-contains-value: 'vpp-verify-perf-ipsechw'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: '{project}'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-            skip-vote:
-                successful: false
-                failed: false
-                unstable: false
-                notbuilt: false
-
-    builders:
-        - shell: 'echo "VPP_BRANCH={branch}" > $WORKSPACE/variables.prop'
-        - inject:
-            properties-file: variables.prop
-        - shell:
-            !include-raw-escape:
-                - ../scripts/setup_vpp_dpdk_dev_env.sh
-                - include-raw-vpp-build.sh
-        - shell:
-            !include-raw-escape:
-                - include-raw-vpp-csit-verify-perf.sh
-
-    publishers:
-        - archive-artifacts:
-            artifacts: 'csit/report.html, csit/log.html, csit/output.xml'
-            latest-only: false
-
-        - robot-report:
-            output-path: 'csit'
-
-        - fdio-infra-shiplogs:
-            maven-version: 'mvn33-new'
-
-- parameter:
-    name: type-parameter
-
-    parameters:
-        - string:
-            name: TYPE
-            default: '{type}'
-            description: "TYPE parameter if not given by trigger"
-
-- job-template:
-    name: 'vpp-docs-verify-{stream}'
-
-    project-type: freestyle
-    node: ubuntu1604-us
-    concurrent: true
-
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameter:
-            branch: '{branch}'
-        - os-parameter:
-            os: 'ubuntu1604'
+        - maven-project-parameter:
+            maven: 'mvn33-new'
         - maven-exec:
             maven-version: 'mvn33-new'
+        - stream-parameter:
+            stream: '{stream}'
+        - repo-name-parameter:
+            repo-name: '{repo-stream-part}.{repo-os-part}'
 
     scm:
         - gerrit-trigger-scm:
             credentials-id: 'jenkins-gerrit-credentials'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+            refspec: ''
+            choosing-strategy: 'default'
 
     wrappers:
         - fdio-infra-wrappers:
             build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-trivial-patch-submitted:
+        - gerrit-trigger-patch-merged:
             name: '{project}'
             branch: '{branch}'
 
     builders:
+        - config-file-provider:
+            files:
+              - file-id: '.packagecloud'
+                target: '/root'
+        - config-file-provider:
+            files:
+              - file-id: 'packagecloud_api'
+                target: '/root'
         - maven-target:
             maven-version: 'mvn33-new'
             goals: '--version'
@@ -826,99 +679,28 @@
             settings-type: cfp
             global-settings: 'global-settings'
             global-settings-type: cfp
-        - provide-maven-settings:
-            settings-file: 'vpp-settings'
-            global-settings-file: 'global-settings'
+        - shell:
+            !include-raw-escape: include-raw-vpp-checkstyle.sh
         - shell:
             !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
         - shell:
-            !include-raw-escape: include-raw-vpp-docs.sh
-    publishers:
-        - archive:
-            artifacts: 'build-root/docs/html/*'
-            allow-empty: 'true'
-            fingerprint: false
-            only-if-success: true
-            default-excludes: false
-        - fdio-infra-shiplogs:
-            maven-version: 'mvn33-new'
-        - naginator:
-            rerun-unstable-builds: true
-            max-failed-builds: 1
-            fixed-delay: 10
-
-- job-template:
-    name: 'vpp-docs-merge-{stream}'
-
-    project-type: freestyle
-    node: ubuntu1604-us
-    concurrent: true
-
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameter:
-            branch: '{branch}'
-        - os-parameter:
-            os: 'ubuntu1604'
-        - maven-exec:
-            maven-version: 'mvn33-new'
-
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: 'jenkins-gerrit-credentials'
-            refspec: ''
-            choosing-strategy: 'default'
-
-    wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
-
-    triggers:
-        - reverse:
-            jobs: 'vpp-merge-{stream}-ubuntu1604'
-            result: 'success'
-        - gerrit:
-            server-name: 'Primary'
-            trigger-on:
-                - comment-added-contains-event:
-                    comment-contains-value: 'run-docs'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: '{project}'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-            skip-vote:
-                successful: true
-                failed: true
-                unstable: true
-                notbuilt: true
-
-    builders:
-        - maven-target:
-            maven-version: 'mvn33-new'
-            goals: '--version'
-            settings: 'vpp-settings'
-            settings-type: cfp
-            global-settings: 'global-settings'
-            global-settings-type: cfp
+            !include-raw-escape:
+                - ../scripts/setup_vpp_dpdk_dev_env.sh
+                - include-raw-vpp-build.sh
         - provide-maven-settings:
             settings-file: 'vpp-settings'
             global-settings-file: 'global-settings'
         - shell:
-            !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
+            !include-raw-escape:
+                - ../scripts/packagecloud_push.sh
         - shell:
-            !include-raw-escape: include-raw-vpp-docs.sh
+            !include-raw-escape:
+                - ../scripts/maven_push_functions.sh
+                - include-raw-vpp-maven-push.sh
+
     publishers:
         - archive:
-            artifacts: 'build-root/docs/html/*'
+            artifacts: 'build-root/*.rpm,build-root/*.deb,dpdk/*.rpm,dpdk/*.deb'
             allow-empty: 'true'
             fingerprint: false
             only-if-success: true
@@ -926,21 +708,20 @@
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
         - naginator:
-            rerun-unstable-builds: true
+            rerun-unstable-builds: false
             max-failed-builds: 1
-            fixed-delay: 10
-
+            fixed-delay: 90
 
 - job-template:
-    name: 'vpp-make-test-docs-verify-{stream}'
+    name: 'vpp-csit-verify-virl-{stream}'
 
     project-type: freestyle
-    node: ubuntu1604-us
+    node: '{os}-us'
     concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        numToKeep: 100
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
@@ -950,9 +731,16 @@
         - gerrit-parameter:
             branch: '{branch}'
         - os-parameter:
-            os: 'ubuntu1604'
-        - maven-exec:
-            maven-version: 'mvn33-new'
+            os: '{os}'
+        - repo-name-parameter:
+            repo-name: '{repo-stream-part}.ubuntu.xenial.main'
+        - is-csit-vpp-job-parameter:
+            is-csit-vpp-job: 'True'
+        - string:
+            name: CSIT_REF
+            description: "Also testing CSIT_REF"
+        - stream-parameter:
+            stream: '{stream}'
 
     scm:
         - gerrit-trigger-scm:
@@ -962,52 +750,47 @@
 
     wrappers:
         - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
+            build-timeout: '90'
 
     triggers:
-        - gerrit-trigger-trivial-patch-submitted:
+        - gerrit-trigger-checkstyle-nonvoting:
             name: '{project}'
             branch: '{branch}'
 
     builders:
-        - maven-target:
-            maven-version: 'mvn33-new'
-            goals: '--version'
-            settings: 'vpp-settings'
-            settings-type: cfp
-            global-settings: 'global-settings'
-            global-settings-type: cfp
-        - provide-maven-settings:
-            settings-file: 'vpp-settings'
-            global-settings-file: 'global-settings'
+        - shell: 'echo "VPP_BRANCH={branch}" > $WORKSPACE/variables.prop'
+        - inject:
+            properties-file: variables.prop
         - shell:
-            !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
+            !include-raw-escape:
+                - ../scripts/setup_vpp_ubuntu_docker_test.sh
+                - ../scripts/setup_vpp_dpdk_dev_env.sh
+                - include-raw-vpp-build.sh
         - shell:
-            !include-raw-escape: include-raw-vpp-make-test-docs.sh
+            !include-raw-escape:
+                - include-raw-vpp-csit-functional.sh
+
     publishers:
-        - archive:
-            artifacts: 'build-root/test-doc/build/html/*'
-            allow-empty: 'true'
-            fingerprint: false
-            only-if-success: true
-            default-excludes: false
+        - archive-artifacts:
+            artifacts: 'csit/report.html, csit/log.html, csit/output.xml'
+            latest-only: false
+
+        - robot-report:
+            output-path: 'csit'
+
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
-        - naginator:
-            rerun-unstable-builds: true
-            max-failed-builds: 1
-            fixed-delay: 10
 
 - job-template:
-    name: 'vpp-make-test-docs-merge-{stream}'
+    name: 'vpp-csit-verify-perf-{stream}-2n-skx'
 
     project-type: freestyle
-    node: ubuntu1604-us
+    node: '{os}-basebuild-8c-32g'
     concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        numToKeep: 100
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
@@ -1017,29 +800,40 @@
         - gerrit-parameter:
             branch: '{branch}'
         - os-parameter:
-            os: 'ubuntu1604'
-        - maven-exec:
-            maven-version: 'mvn33-new'
+            os: '{os}'
+        - repo-name-parameter:
+            repo-name: '{repo-stream-part}.ubuntu.bionic.main'
+        - gerrit-refspec-parameter
+        - gerrit-event-type-parameter
+        - gerrit-event-comment-text-parameter
+        - gerrit-csit-refspec-parameter
+        - string:
+            name: CSIT_PERF_TRIAL_DURATION
+            default: "1.0"
+            description: "Duration of a trial measurement in BMRR tests."
+        - string:
+            name: CSIT_PERF_TRIAL_MULTIPLICITY
+            default: "30"
+            description: "Number of subsamples for BMRR tests."
+        - stream-parameter:
+            stream: '{stream}'
 
     scm:
         - gerrit-trigger-scm:
             credentials-id: 'jenkins-gerrit-credentials'
-            refspec: ''
-            choosing-strategy: 'default'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
 
     wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
+        - fdio-infra-wrappers-non-activity-timeout:
+            build-timeout: 300
 
     triggers:
-        - reverse:
-            jobs: 'vpp-merge-{stream}-ubuntu1604'
-            result: 'success'
         - gerrit:
             server-name: 'Primary'
             trigger-on:
                 - comment-added-contains-event:
-                    comment-contains-value: 'run-docs'
+                    comment-contains-value: 'perftest'
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: '{project}'
@@ -1053,32 +847,26 @@
                 notbuilt: true
 
     builders:
-        - maven-target:
-            maven-version: 'mvn33-new'
-            goals: '--version'
-            settings: 'vpp-settings'
-            settings-type: cfp
-            global-settings: 'global-settings'
-            global-settings-type: cfp
-        - provide-maven-settings:
-            settings-file: 'vpp-settings'
-            global-settings-file: 'global-settings'
         - shell:
-            !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
-        - shell:
-            !include-raw-escape: include-raw-vpp-make-test-docs.sh
+            !include-raw-escape:
+                - clone-csit-run-main.sh
+
     publishers:
-        - archive:
-            artifacts: 'build-root/test-doc/build/html/*'
-            allow-empty: 'true'
-            fingerprint: false
-            only-if-success: true
-            default-excludes: false
+        - archive-artifacts:
+            artifacts: 'csit_new/*.*, csit_parent/*.*'
+            latest-only: false
+
+        - robot-report:
+            output-path: 'csit_new/'
+
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
-        - naginator:
-            rerun-unstable-builds: true
-            max-failed-builds: 1
-            fixed-delay: 10
 
+- parameter:
+    name: type-parameter
 
+    parameters:
+        - string:
+            name: TYPE
+            default: '{type}'
+            description: "TYPE parameter if not given by trigger"