X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fvpp%2Fvpp.yaml;h=dc1672e75fab837de8bb835e51e0c59655e43998;hb=c61eb91c69b62163d075136cf3f1f05234737466;hp=69a404ac95d34402e928ed0c1bd8ac4999d6dbbd;hpb=56b787afd07f381bfb3deddafd4d7a9cf642a1e9;p=ci-management.git

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 69a404ac9..dc1672e75 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -16,21 +16,15 @@
       - master:
           branch: 'master'
           repo-stream-part: 'master'
-      - '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'
-      - '1810':
-          branch: 'stable/1810'
-          repo-stream-part: 'stable.1810'
       - '1901':
           branch: 'stable/1901'
           repo-stream-part: 'stable.1901'
+      - '1904':
+          branch: 'stable/1904'
+          repo-stream-part: 'stable.1904'
+      - '1908':
+          branch: 'stable/1908'
+          repo-stream-part: 'stable.1908'
 
 - project:
     name: vpp-clang
@@ -54,40 +48,56 @@
 - project:
     name: vpp-misc
     jobs:
-      - 'vpp-csit-verify-virl-{stream}'
       - 'vpp-checkstyle-verify-{stream}'
     project: 'vpp'
     stream:
       - master:
           branch: 'master'
           repo-stream-part: 'master'
-      - '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'
-      - '1810':
-          branch: 'stable/1810'
-          repo-stream-part: 'stable.1810'
       - '1901':
           branch: 'stable/1901'
           repo-stream-part: 'stable.1901'
+      - '1904':
+          branch: 'stable/1904'
+          repo-stream-part: 'stable.1904'
+      - '1908':
+          branch: 'stable/1908'
+          repo-stream-part: 'stable.1908'
     os: ubuntu1604
 
 - project:
     name: vpp-perpatch
     jobs:
-      - 'vpp-csit-verify-perf-{stream}-2n-skx'
+      - 'vpp-csit-verify-device-{stream}-{device-node-arch}'
+      - 'vpp-csit-verify-perf-{stream}-{node-arch}'
     project: 'vpp'
+    executor: 'vpp-csit-device'
+    skip-vote: 'true'
+    trigger: 'gerrit-trigger-csit-devicetest-full'
     stream:
       - master:
           branch: 'master'
           repo-stream-part: 'master'
-    os: ubuntu1604
+      - '1904':
+          branch: 'stable/1904'
+          repo-stream-part: 'stable.1904'
+      - '1908':
+          branch: 'stable/1908'
+          repo-stream-part: 'stable.1908'
+    os: ubuntu1804
+    device-node-arch:
+      - 1n-skx
+      - 1n-tx2:
+          executor: 'vpp-csit-arm-ubuntu18'
+          trigger: 'gerrit-trigger-csit-devicetest-manual'
+    node-arch:
+      - 2n-skx
+      - 3n-skx
+      - 3n-hsw
+    exclude:
+      - stream: '1904'
+        os: 'ubuntu1804'
+        device-node-arch: '1n-tx2'
 
 - project:
     name: vpp-master-only
@@ -102,6 +112,12 @@
       - '1901':
           branch: 'stable/1901'
           repo-stream-part: 'stable.1901'
+      - '1904':
+          branch: 'stable/1904'
+          repo-stream-part: 'stable.1904'
+      - '1908':
+          branch: 'stable/1908'
+          repo-stream-part: 'stable.1908'
     os:
       - ubuntu1804:
           repo-os-part: 'ubuntu.bionic.main'
@@ -119,29 +135,39 @@
       - '1901':
           branch: 'stable/1901'
           repo-stream-part: 'stable.1901'
+      - '1904':
+          branch: 'stable/1904'
+          repo-stream-part: 'stable.1904'
+      - '1908':
+          branch: 'stable/1908'
+          repo-stream-part: 'stable.1908'
     os:
       - ubuntu1804:
           repo-os-part: 'ubuntu-arm.bionic.main'
 
+# TODO: Merge with (e.g.) vpp-perpatch or similar,
+# when number of stable branches supported matches.
 - project:
-    name: vpp-arm-old
+    name: vpp-api-crc
     jobs:
-      - 'vpp-arm-old-verify-{stream}-{os}'
-      - 'vpp-arm-old-merge-{stream}-{os}'
+      - 'vpp-csit-verify-api-crc-{stream}'
     project: 'vpp'
+    executor: 'vpp-csit-device'
+    skip-vote: 'false'
     stream:
-      - '1804':
-          branch: 'stable/1804'
-          repo-stream-part: 'stable.1804'
-      - '1807':
-          branch: 'stable/1807'
-          repo-stream-part: 'stable.1807'
-      - '1810':
-          branch: 'stable/1810'
-          repo-stream-part: 'stable.1810'
-    os:
-      - ubuntu1604:
-          repo-os-part: 'ubuntu-arm.xenial.main'
+      # TODO: Add stable/1908 when it is created.
+      - master:
+          branch: 'master'
+    os: ubuntu1804
+
+- project:
+    name: vpp-info
+    project-name: vpp
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-4c-4g
+    project: vpp
+    branch: master
 
 - project:
     name: vpp-view
@@ -155,6 +181,17 @@
     project-type: freestyle
     node: '{os}-us'
     concurrent: true
+    archive-artifacts: >
+      **/build-root/*.rpm
+      **/build-root/*.deb
+      **/dpdk/*.rpm
+      **/dpdk/*.deb
+      **/tmp/vpp-failed-unittests/*/* **/core
+    allow-empty: 'true'
+    fingerprint: false
+    only-if-success: true
+    default-excludes: false
+
     triggers:
       - gerrit-trigger-checkstyle:
           name: '{project}'
@@ -177,6 +214,10 @@
           repo-name: '{repo-stream-part}.{repo-os-part}'
       - stream-parameter:
           stream: '{stream}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -197,19 +238,8 @@
           - 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'
+          maven-version: 'mvn36'
       - naginator:
           rerun-unstable-builds: false
           max-failed-builds: 1
@@ -220,6 +250,15 @@
 
     project-type: freestyle
     node: '{os}-us'
+    archive-artifacts: >
+      **/build-root/*.rpm
+      **/build-root/*.deb
+      **/dpdk/*.rpm
+      **/dpdk/*.deb
+    allow-empty: 'true'
+    fingerprint: false
+    only-if-success: true
+    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -242,6 +281,10 @@
           stream: '{stream}'
       - repo-name-parameter:
           repo-name: '{repo-stream-part}.{repo-os-part}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -267,13 +310,6 @@
           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:
@@ -286,87 +322,10 @@
       - 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
-          allow-empty: 'true'
-          fingerprint: false
-          only-if-success: true
-          default-excludes: false
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
-
-- job-template:
-    name: 'vpp-arm-old-verify-{stream}-{os}'
-
-    project-type: freestyle
-    node: '{os}arm-us'
-    concurrent: true
-
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: 100
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-      - gerrit-parameter:
-          branch: '{branch}'
-      - os-parameter:
-          os: '{os}'
-      - repo-name-parameter:
-          repo-name: '{repo-stream-part}.{repo-os-part}'
-      - stream-parameter:
-          stream: '{stream}'
-
-    scm:
-      - gerrit-trigger-scm:
-          credentials-id: 'jenkins-gerrit-credentials'
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-
-    wrappers:
-      - fdio-infra-wrappers:
-          build-timeout: 120
-
-    triggers:
-      - gerrit-trigger-checkstyle:
-          name: '{project}'
-          branch: '{branch}'
-
-    builders:
-      - shell:
-          !include-raw-escape: ../scripts/setup_vpp_ubuntu_arm_test.sh
-      - shell:
-          !include-raw-escape:
-          - ../scripts/setup_vpp_dpdk_dev_env.sh
-          - include-raw-vpp-arm-build-no-test.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'
+          maven-version: 'mvn36'
 
 - job-template:
     name: 'vpp-arm-verify-{stream}-{os}'
@@ -374,6 +333,15 @@
     project-type: freestyle
     node: '{os}arm-us'
     concurrent: true
+    archive-artifacts: >
+      **/build-root/*.rpm
+      **/build-root/*.deb
+      **/dpdk/*.rpm
+      **/dpdk/*.deb
+    allow-empty: 'true'
+    fingerprint: false
+    only-if-success: true
+    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -392,6 +360,10 @@
           repo-name: '{repo-stream-part}.{repo-os-part}'
       - stream-parameter:
           stream: '{stream}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -418,25 +390,28 @@
           - include-raw-vpp-arm-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'
+          maven-version: 'mvn36'
           archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
+      - naginator:
+          rerun-unstable-builds: false
+          max-failed-builds: 1
+          fixed-delay: 90
 
 - job-template:
     name: 'vpp-arm-merge-{stream}-{os}'
 
     project-type: freestyle
     node: '{os}arm-m'
+    archive-artifacts: >
+      **/build-root/*.rpm
+      **/build-root/*.deb
+      **/dpdk/*.rpm
+      **/dpdk/*.deb
+    allow-empty: 'true'
+    fingerprint: false
+    only-if-success: true
+    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -459,6 +434,10 @@
           stream: '{stream}'
       - repo-name-parameter:
           repo-name: '{repo-stream-part}.{repo-os-part}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -484,101 +463,6 @@
           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_arm_test.sh
-      - shell:
-          !include-raw-escape:
-          - ../scripts/setup_vpp_dpdk_dev_env.sh
-          - include-raw-vpp-parallel-vars.sh
-          - include-raw-vpp-arm-build-no-test.sh
-
-      - provide-maven-settings:
-          settings-file: 'vpp-settings'
-          global-settings-file: 'global-settings'
-      - shell:
-          !include-raw-escape:
-          - ../scripts/packagecloud_push.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'
-
-- job-template:
-    name: 'vpp-arm-old-merge-{stream}-{os}'
-
-    project-type: freestyle
-    node: '{os}arm-us'
-
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: 100
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-      - gerrit-parameter:
-          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: ''
-          choosing-strategy: 'default'
-
-    wrappers:
-      - fdio-infra-wrappers:
-          build-timeout: 120
-
-    triggers:
-      - 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'
-          settings: 'vpp-settings'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
       - shell:
           !include-raw-escape: ../scripts/setup_vpp_ubuntu_arm_test.sh
       - shell:
@@ -593,24 +477,10 @@
       - 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
-          allow-empty: 'true'
-          fingerprint: false
-          only-if-success: true
-          default-excludes: false
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
 
 - job-template:
     name: 'vpp-checkstyle-verify-{stream}'
@@ -652,7 +522,7 @@
             - patchset-created-event:
                 exclude-drafts: 'true'
                 exclude-trivial-rebase: 'false'
-                exclude-no-code-change: 'true'
+                exclude-no-code-change: 'false'
             - draft-published-event
             - comment-added-contains-event:
                 comment-contains-value: 'checkstylecheck'
@@ -662,6 +532,11 @@
                 comment-contains-value: 'recheck'
             - comment-added-contains-event:
                 comment-contains-value: 'reverify'
+            # Following two are to cover missing functions of drafts going to review status
+            - comment-added-contains-event:
+                comment-contains-value: 'runtest'
+            - comment-added-contains-event:
+                comment-contains-value: 'This change is ready for review'
           projects:
             - project-compare-type: 'ANT'
               project-pattern: '{project}'
@@ -696,10 +571,12 @@
           !include-raw-escape: include-raw-vpp-checkstyle.sh
       - shell:
           !include-raw-escape: include-raw-vpp-test-checkstyle.sh
+      - shell:
+          !include-raw-escape: include-raw-vpp-commitmsg.sh
 
     publishers:
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
           archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
       - naginator:
           rerun-unstable-builds: true
@@ -712,6 +589,15 @@
     project-type: freestyle
     node: '{os}-us'
     concurrent: true
+    archive-artifacts: >
+      **/build-root/*.rpm
+      **/build-root/*.deb
+      **/dpdk/*.rpm
+      **/dpdk/*.deb
+    allow-empty: 'true'
+    fingerprint: false
+    only-if-success: true
+    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -730,6 +616,10 @@
           repo-name: '{repo-stream-part}.{repo-os-part}'
       - stream-parameter:
           stream: '{stream}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -755,19 +645,8 @@
           - 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'
+          maven-version: 'mvn36'
           archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
       - naginator:
           rerun-unstable-builds: false
@@ -824,7 +703,7 @@
 
     publishers:
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
           archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
       - naginator:
           rerun-unstable-builds: false
@@ -836,6 +715,15 @@
 
     project-type: freestyle
     node: '{os}-us'
+    archive-artifacts: >
+      **/build-root/*.rpm
+      **/build-root/*.deb
+      **/dpdk/*.rpm
+      **/dpdk/*.deb
+    allow-empty: 'true'
+    fingerprint: false
+    only-if-success: true
+    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -858,6 +746,10 @@
           stream: '{stream}'
       - repo-name-parameter:
           repo-name: '{repo-stream-part}.{repo-os-part}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -883,13 +775,6 @@
           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: include-raw-vpp-checkstyle.sh
       - shell:
@@ -904,35 +789,23 @@
       - 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
-          allow-empty: 'true'
-          fingerprint: false
-          only-if-success: true
-          default-excludes: false
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
       - naginator:
           rerun-unstable-builds: false
           max-failed-builds: 1
           fixed-delay: 90
 
 - job-template:
-    name: 'vpp-csit-verify-virl-{stream}'
+    name: 'vpp-csit-verify-device-{stream}-{device-node-arch}'
 
     project-type: freestyle
-    node: '{os}-us'
+    node: '{executor}'
     concurrent: true
+    archive-artifacts: '**/csit_current/**/*.*'
+    latest-only: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -948,14 +821,20 @@
       - 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}.ubuntu.bionic.main'
+      - gerrit-refspec-parameter
+      - gerrit-event-type-parameter
+      - gerrit-event-comment-text-parameter
+      - gerrit-csit-refspec-parameter
       - stream-parameter:
           stream: '{stream}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
+      # The API CRC job fails on mismatch, we hunt for real incompatibilities.
+      - csit-fail-on-crc-mismatch-parameter:
+          fail-on-crc-mismatch: 'False'
 
     scm:
       - gerrit-trigger-scm:
@@ -968,43 +847,38 @@
           build-timeout: '90'
 
     triggers:
-      - gerrit-trigger-csit-virltest:
+      - '{trigger}':
           name: '{project}'
           branch: '{branch}'
+          skip-vote: '{skip-vote}'
 
     builders:
-      - shell: 'echo "VPP_BRANCH={branch}" > $WORKSPACE/variables.prop'
-      - inject:
-          properties-file: variables.prop
       - shell:
-          !include-raw-escape:
-          - ../scripts/setup_vpp_ubuntu_docker_test.sh
-          - ../scripts/setup_vpp_dpdk_dev_env.sh
-          - include-raw-vpp-build.sh
+          !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
+      - shell:
+          !include-raw-escape: ../scripts/setup_vpp_dpdk_dev_env.sh
       - shell:
           !include-raw-escape:
-          - include-raw-vpp-csit-functional.sh
+            - include-raw-vpp-parallel-vars.sh
+            - include-raw-vpp-csit-device.sh
 
     publishers:
-      - archive-artifacts:
-          artifacts: >
-            **/csit/report.html,
-            **/csit/log.html,
-            **/csit/output.xml
-          latest-only: false
-
       - robot-report:
-          output-path: 'csit'
+          output-path: 'csit_current/'
 
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
 
 - job-template:
-    name: 'vpp-csit-verify-perf-{stream}-2n-skx'
+    name: 'vpp-csit-verify-perf-{stream}-{node-arch}'
 
     project-type: freestyle
-    node: '{os}-basebuild-8c-32g'
+    node: '{os}-us'
     concurrent: true
+    archive-artifacts: >
+      **/csit_current/**/*.*
+      **/csit_parent/**/*.*
+    latest-only: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -1027,14 +901,21 @@
       - gerrit-csit-refspec-parameter
       - string:
           name: CSIT_PERF_TRIAL_DURATION
-          default: "1.0"
+          default: "10.0"
           description: "Duration of a trial measurement in BMRR tests."
       - string:
           name: CSIT_PERF_TRIAL_MULTIPLICITY
-          default: "8"
+          default: "5"
           description: "Number of subsamples for BMRR tests."
       - stream-parameter:
           stream: '{stream}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
+      # The API CRC job fails on mismatch, try compare API versions if possible.
+      - csit-fail-on-crc-mismatch-parameter:
+          fail-on-crc-mismatch: 'False'
 
     scm:
       - gerrit-trigger-scm:
@@ -1050,21 +931,76 @@
       - gerrit-trigger-csit-perftest:
           name: '{project}'
           branch: '{branch}'
+          node-arch: '{node-arch}'
 
     builders:
       - shell:
-          !include-raw-escape:
-          - clone-csit-run-main.sh
+          !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
+      - shell:
+          !include-raw-escape: ../scripts/setup_vpp_dpdk_dev_env.sh
+      - shell:
+          !include-raw-escape: include-raw-vpp-csit-perf.sh
 
     publishers:
-      - archive-artifacts:
-          artifacts: >
-            **/csit_new/**/*.*,
-            **/csit_parent/**/*.*
-          latest-only: false
-
       - robot-report:
-          output-path: 'csit_new/0/'
+          output-path: 'csit_current/0/'
 
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
+
+- job-template:
+    name: 'vpp-csit-verify-api-crc-{stream}'
+
+    project-type: freestyle
+    node: '{os}-us'
+    concurrent: true
+    archive-artifacts: ''
+    latest-only: false
+
+    build-discarder:
+      daysToKeep: '{build-days-to-keep}'
+      numToKeep: 100
+      artifactDaysToKeep: '{build-artifact-days-to-keep}'
+      artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+      - project-parameter:
+          project: '{project}'
+      - gerrit-parameter:
+          branch: '{branch}'
+      - gerrit-refspec-parameter
+      - gerrit-csit-refspec-parameter
+      - stream-parameter:
+          stream: '{stream}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
+
+    scm:
+      - gerrit-trigger-scm:
+          credentials-id: 'jenkins-gerrit-credentials'
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
+
+    wrappers:
+      - fdio-infra-wrappers-non-activity-timeout:
+          build-timeout: 300
+
+    triggers:
+      # TODO: Make other verify jobs trigger on success of this one,
+      # without breaking verification for VPP branches before stable/1908.
+      - gerrit-trigger-checkstyle:
+          name: '{project}'
+          branch: '{branch}'
+
+    builders:
+      - shell:
+          !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
+      - shell:
+          !include-raw-escape: check_crc.sh
+      # TODO: Add sending e-mail notifications to vpp-api-dev@lists.fd.io
+
+    publishers:
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn36'