X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Fvpp.yaml;h=fd4afb0a9c887d2cf5522f6009426f3768142b6d;hb=refs%2Fchanges%2F16%2F24916%2F1;hp=eebe0a32db368346ee196ede58ea13b4212d558f;hpb=5b2b0a4babd61beab258396749ba9aab1e7980fb;p=ci-management.git

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index eebe0a32d..fd4afb0a9 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -7,8 +7,8 @@
 
     project: 'vpp'
     os:
-      - ubuntu1604:
-          repo-os-part: 'ubuntu.xenial.main'
+      - ubuntu1804:
+          repo-os-part: 'ubuntu.bionic.main'
       - centos7:
           repo-os-part: 'centos7'
 
@@ -16,17 +16,38 @@
       - master:
           branch: 'master'
           repo-stream-part: 'master'
-      - '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'
+      - '2001':
+          branch: 'stable/2001'
+          repo-stream-part: 'stable.2001'
+- project:
+    name: vpp-beta
+    jobs:
+      - 'vpp-beta-verify-{stream}-{os}'
+      - 'vpp-beta-merge-{stream}-{os}'
+
+    project: 'vpp'
+    os:
+      - ubuntu2004:
+          repo-os-part: 'ubuntu.focal.main'
+      - centos8:
+          repo-os-part: 'centos8'
+
+    stream:
+      - master:
+          branch: 'master'
+          repo-stream-part: 'master'
 
 - project:
     name: vpp-clang
     jobs:
       - 'vpp-verify-{stream}-clang'
+      - 'vpp-coverity-{stream}'
 
     project: 'vpp'
     os:
@@ -57,7 +78,13 @@
       - '1904':
           branch: 'stable/1904'
           repo-stream-part: 'stable.1904'
-    os: ubuntu1604
+      - '1908':
+          branch: 'stable/1908'
+          repo-stream-part: 'stable.1908'
+      - '2001':
+          branch: 'stable/2001'
+          repo-stream-part: 'stable.2001'
+    os: ubuntu1804
 
 - project:
     name: vpp-perpatch
@@ -65,8 +92,11 @@
       - 'vpp-csit-verify-device-{stream}-{device-node-arch}'
       - 'vpp-csit-verify-perf-{stream}-{node-arch}'
     project: 'vpp'
-    executor: 'vpp-csit-device'
+    os: ubuntu1804
+    device-executor: 'vpp-csit-device'
+    executor: '{os}-us'
     skip-vote: 'true'
+    trigger: 'gerrit-trigger-vpp-csit-devicetest-full'
     stream:
       - master:
           branch: 'master'
@@ -74,39 +104,53 @@
       - '1904':
           branch: 'stable/1904'
           repo-stream-part: 'stable.1904'
-    os: ubuntu1804
+      - '1908':
+          branch: 'stable/1908'
+          repo-stream-part: 'stable.1908'
+      - '2001':
+          branch: 'stable/2001'
+          repo-stream-part: 'stable.2001'
     device-node-arch:
       - 1n-skx
       - 1n-tx2:
-          executor: 'vpp-csit-arm-ubuntu18'
+          device-executor: 'vpp-csit-arm-ubuntu18'
+          trigger: 'gerrit-trigger-vpp-csit-devicetest-manual'
     node-arch:
+      - 2n-clx
       - 2n-skx
       - 3n-skx
       - 3n-hsw
+      - 2n-dnv
+      - 3n-dnv
+      - 3n-tsh:
+          executor: 'ubuntu1804arm-s'
     exclude:
       - stream: '1904'
         os: 'ubuntu1804'
         device-node-arch: '1n-tx2'
 
 - project:
-    name: vpp-master-only
+    name: vpp-older-only
     jobs:
-      - 'vpp-beta-verify-{stream}-{os}'
-      - 'vpp-beta-merge-{stream}-{os}'
+      - 'vpp-historic-verify-{stream}-{os}'
+      - 'vpp-historic-merge-{stream}-{os}'
     project: 'vpp'
     stream:
-      - master:
-          branch: 'master'
-          repo-stream-part: 'master'
       - '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'
+      - '2001':
+          branch: 'stable/2001'
+          repo-stream-part: 'stable.2001'
     os:
-      - ubuntu1804:
-          repo-os-part: 'ubuntu.bionic.main'
+      - ubuntu1604:
+          repo-os-part: 'ubuntu.xenial.main'
 
 - project:
     name: vpp-arm
@@ -124,10 +168,40 @@
       - '1904':
           branch: 'stable/1904'
           repo-stream-part: 'stable.1904'
+      - '1908':
+          branch: 'stable/1908'
+          repo-stream-part: 'stable.1908'
+      - '2001':
+          branch: 'stable/2001'
+          repo-stream-part: 'stable.2001'
     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-api-crc
+    jobs:
+      - 'vpp-csit-verify-api-crc-{stream}'
+    project: 'vpp'
+    executor: 'vpp-csit-device'
+    skip-vote: 'false'
+    stream:
+      # 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
     views:
@@ -135,21 +209,12 @@
     project-name: vpp
 
 - job-template:
-    name: 'vpp-beta-verify-{stream}-{os}'
+    name: 'vpp-historic-verify-{stream}-{os}'
 
     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
+    archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
 
     triggers:
       - gerrit-trigger-checkstyle:
@@ -190,34 +255,28 @@
 
     builders:
       - shell:
-          !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
+          !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
+      - shell:
+          !include-raw-escape:
+          - ../scripts/vpp/build.sh
 
     publishers:
       - 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-beta-merge-{stream}-{os}'
+    name: 'vpp-historic-merge-{stream}-{os}'
 
     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}'
@@ -270,11 +329,14 @@
             - file-id: 'packagecloud_api'
               target: '/root'
       - shell:
-          !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
+          !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
+      - shell:
+          !include-raw-escape:
+          - ../scripts/vpp/build.sh
       - provide-maven-settings:
           settings-file: 'vpp-settings'
           global-settings-file: 'global-settings'
@@ -284,12 +346,7 @@
 
     publishers:
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
-
-    publishers:
-      - 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}'
@@ -297,15 +354,7 @@
     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
+    archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -346,17 +395,20 @@
 
     builders:
       - shell:
-          !include-raw-escape: ../scripts/setup_vpp_ubuntu_arm_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-parallel-vars.sh
-          - include-raw-vpp-arm-build.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/vpp/parallel-vars.sh
+          # Do not split, the line below wants env vars from the line above.
+          - ../scripts/vpp/arm-build.sh
 
     publishers:
       - 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
@@ -367,15 +419,6 @@
 
     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}'
@@ -428,12 +471,16 @@
             - file-id: 'packagecloud_api'
               target: '/root'
       - shell:
-          !include-raw-escape: ../scripts/setup_vpp_ubuntu_arm_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-parallel-vars.sh
-          - include-raw-vpp-arm-build-no-test.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/vpp/parallel-vars.sh
+          # Do not split, the line below wants env vars from the line above.
+          - ../scripts/vpp/arm-build-no-test.sh
 
       - provide-maven-settings:
           settings-file: 'vpp-settings'
@@ -444,7 +491,7 @@
 
     publishers:
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
 
 - job-template:
     name: 'vpp-checkstyle-verify-{stream}'
@@ -452,6 +499,7 @@
     project-type: freestyle
     node: '{os}-us'
     concurrent: true
+    archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -467,7 +515,7 @@
       - os-parameter:
           os: '{os}'
       - repo-name-parameter:
-          repo-name: '{repo-stream-part}.ubuntu.xenial.main'
+          repo-name: '{repo-stream-part}.ubuntu.bionic.main'
 
     scm:
       - gerrit-trigger-scm:
@@ -486,7 +534,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'
@@ -496,6 +544,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}'
@@ -527,36 +580,91 @@
 
     builders:
       - shell:
-          !include-raw-escape: include-raw-vpp-checkstyle.sh
+          !include-raw-escape:
+          - ../scripts/vpp/checkstyle.sh
       - shell:
-          !include-raw-escape: include-raw-vpp-test-checkstyle.sh
+          !include-raw-escape:
+          - ../scripts/vpp/test-checkstyle.sh
       - shell:
-          !include-raw-escape: include-raw-vpp-commitmsg.sh
+          !include-raw-escape:
+          - ../scripts/vpp/commitmsg.sh
 
     publishers:
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
-          archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
+          maven-version: 'mvn36'
       - naginator:
           rerun-unstable-builds: true
           max-failed-builds: 1
           fixed-delay: 90
 
+- job-template:
+    name: 'vpp-beta-verify-{stream}-{os}'
+
+    project-type: freestyle
+    node: '{os}-us'
+    concurrent: true
+    archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
+
+    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}'
+      - 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:
+          build-timeout: 120
+
+    triggers:
+      - gerrit-trigger-manually-triggered:
+          comment-trigger-value: 'betacheck'
+          name: '{project}'
+          branch: '{branch}'
+
+    builders:
+      - shell:
+          !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:
+          - ../scripts/vpp/build.sh
+
+    publishers:
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn36'
+
 - job-template:
     name: 'vpp-verify-{stream}-{os}'
 
     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
+    archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -597,16 +705,18 @@
 
     builders:
       - shell:
-          !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
+          !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
+      - shell:
+          !include-raw-escape:
+          - ../scripts/vpp/build.sh
 
     publishers:
       - 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: 2
@@ -618,6 +728,7 @@
     project-type: freestyle
     node: 'ubuntu1804-us'
     concurrent: true
+    archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -631,7 +742,7 @@
       - gerrit-parameter:
           branch: '{branch}'
       - os-parameter:
-          os: 'ubuntu1604'
+          os: 'ubuntu1804'
       - repo-name-parameter:
           repo-name: '{repo-stream-part}.ubuntu.bionic.main'
       - stream-parameter:
@@ -654,35 +765,127 @@
 
     builders:
       - shell:
-          !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
+          !include-raw-escape:
+          - ../scripts/setup_vpp_ubuntu_docker_test.sh
       - shell:
           !include-raw-escape:
           - ../scripts/setup_vpp_dpdk_dev_env.sh
-          - include-raw-vpp-clang-build.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/vpp/clang-build.sh
 
     publishers:
       - 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
           fixed-delay: 90
 
+- job-template:
+    name: 'vpp-coverity-{stream}'
+
+    project-type: freestyle
+    node: 'ubuntu1804-us'
+    concurrent: true
+    archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
+
+    build-discarder:
+      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: 'ubuntu1804'
+      - repo-name-parameter:
+          repo-name: '{repo-stream-part}.ubuntu.bionic.main'
+      - stream-parameter:
+          stream: '{stream}'
+
+    scm:
+      - gerrit-trigger-scm:
+          credentials-id: 'jenkins-gerrit-credentials'
+          refspec: ''
+          choosing-strategy: 'gerrit'
+
+    wrappers:
+      - fdio-infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      - timed: '0 14 * * *'
+
+    builders:
+      - shell:
+          command: !include-raw-escape: ../scripts/vpp/coverity.sh
+          unstable-return: 42
+
+    publishers:
+      - email-ext:
+          # yamllint disable-line rule:line-length
+          recipients: 'ejk@cisco.com'
+          reply-to: ''
+          content-type: 'text'
+          subject: 'Coverity run passing as of $BUILD_TIMESTAMP'
+          # yamllint disable-line rule:line-length
+          body: |
+                Coverity run passing.
+
+                ${{FILE,path="output.txt"}}
+          failure: false
+          success: true
+      - email-ext:
+          # yamllint disable-line rule:line-length
+          recipients: 'ejk@cisco.com'
+          reply-to: ''
+          content-type: 'text'
+          subject: 'Coverity run UNSTABLE as of $BUILD_TIMESTAMP'
+          # yamllint disable-line rule:line-length
+          body: |
+                Coverity run UNSTABLE.
+
+                Something went wrong with daily scan.
+          failure: false
+          unstable: true
+      - email-ext:
+          # yamllint disable-line rule:line-length
+          recipients: 'vpp-dev@lists.fd.io, ejk@cisco.com'
+          reply-to: ''
+          content-type: 'text'
+          subject: 'Coverity run FAILED as of $BUILD_TIMESTAMP'
+          # yamllint disable-line rule:line-length
+          body: |
+                Coverity run failed today.
+
+                ${{FILE,path="output.txt"}}
+          failure: true
+      - email-ext:
+          # yamllint disable-line rule:line-length
+          recipients: 'vpp-dev@lists.fd.io, ejk@cisco.com'
+          reply-to: ''
+          content-type: 'text'
+          subject: 'Coverity run as of $BUILD_TIMESTAMP'
+          # yamllint disable-line rule:line-length
+          body: |
+                Coverity run fixed today.
+
+                ${{FILE,path="output.txt"}}
+          failure: false
+          fixed: true
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn36'
+
 - job-template:
     name: 'vpp-merge-{stream}-{os}'
 
     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}'
@@ -735,13 +938,17 @@
             - file-id: 'packagecloud_api'
               target: '/root'
       - shell:
-          !include-raw-escape: include-raw-vpp-checkstyle.sh
+          !include-raw-escape:
+          - ../scripts/vpp/checkstyle.sh
       - shell:
-          !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
+          !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
+      - shell:
+          !include-raw-escape:
+          - ../scripts/vpp/build.sh
       - provide-maven-settings:
           settings-file: 'vpp-settings'
           global-settings-file: 'global-settings'
@@ -751,17 +958,104 @@
 
     publishers:
       - 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-beta-merge-{stream}-{os}'
+
+    project-type: freestyle
+    node: '{os}-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}'
+      - 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: ''
+          choosing-strategy: 'default'
+
+    wrappers:
+      - fdio-infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      - gerrit-trigger-manually-triggered:
+          comment-trigger-value: 'betamerge'
+          name: '{project}'
+          branch: '{branch}'
+
+    builders:
+      - config-file-provider:
+          files:
+            - file-id: '.packagecloud'
+              target: '/root'
+      - config-file-provider:
+          files:
+            - file-id: 'packagecloud_api'
+              target: '/root'
+      - shell:
+          !include-raw-escape:
+          - ../scripts/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
+      - shell:
+          !include-raw-escape:
+          - ../scripts/vpp/build.sh
+      - provide-maven-settings:
+          settings-file: 'vpp-settings'
+          global-settings-file: 'global-settings'
+      - shell:
+          !include-raw-escape:
+          - ../scripts/packagecloud_push.sh
+
+    publishers:
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn36'
+
 - job-template:
     name: 'vpp-csit-verify-device-{stream}-{device-node-arch}'
+    description: |
+      <ul>
+          <li>executor
+              <ul>
+                  <li>{device-executor}
+              </ul>
+      </ul>
 
     project-type: freestyle
-    node: '{executor}'
+    node: '{device-executor}'
     concurrent: true
     archive-artifacts: '**/csit_current/**/*.*'
     latest-only: false
@@ -803,33 +1097,41 @@
           build-timeout: '90'
 
     triggers:
-      - gerrit-trigger-csit-devicetest:
+      - '{trigger}':
           name: '{project}'
           branch: '{branch}'
           skip-vote: '{skip-vote}'
 
     builders:
       - shell:
-          !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
+          !include-raw-escape:
+          - ../scripts/setup_vpp_ubuntu_docker_test.sh
       - shell:
-          !include-raw-escape: ../scripts/setup_vpp_dpdk_dev_env.sh
+          !include-raw-escape:
+          - ../scripts/setup_vpp_dpdk_dev_env.sh
       - shell:
           !include-raw-escape:
-            - include-raw-vpp-parallel-vars.sh
-            - include-raw-vpp-csit-device.sh
+          - ../scripts/vpp/csit-device.sh
 
     publishers:
       - robot-report:
           output-path: 'csit_current/'
 
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
 
 - job-template:
     name: 'vpp-csit-verify-perf-{stream}-{node-arch}'
+    description: |
+      <ul>
+          <li>executor
+              <ul>
+                  <li>{executor}
+              </ul>
+      </ul>
 
     project-type: freestyle
-    node: '{os}-us'
+    node: '{executor}'
     concurrent: true
     archive-artifacts: >
       **/csit_current/**/*.*
@@ -855,14 +1157,10 @@
       - gerrit-event-type-parameter
       - gerrit-event-comment-text-parameter
       - gerrit-csit-refspec-parameter
-      - string:
-          name: CSIT_PERF_TRIAL_DURATION
-          default: "10.0"
-          description: "Duration of a trial measurement in BMRR tests."
-      - string:
-          name: CSIT_PERF_TRIAL_MULTIPLICITY
-          default: "5"
-          description: "Number of subsamples for BMRR tests."
+      - csit-perf-trial-duration-parameter:
+          csit-perf-trial-duration: "10.0"
+      - csit-perf-trial-multiplicity-parameter:
+          csit-perf-trial-multiplicity: "5"
       - stream-parameter:
           stream: '{stream}'
       - string:
@@ -888,24 +1186,81 @@
 
     builders:
       - shell:
-          !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
+          !include-raw-escape:
+          - ../scripts/setup_vpp_ubuntu_docker_test.sh
       - shell:
-          !include-raw-escape: ../scripts/setup_vpp_dpdk_dev_env.sh
+          !include-raw-escape:
+          - ../scripts/setup_vpp_dpdk_dev_env.sh
       - shell:
-          !include-raw-escape: include-raw-vpp-csit-perf.sh
+          !include-raw-escape:
+          - ../scripts/vpp/csit-perf.sh
 
     publishers:
       - robot-report:
           output-path: 'csit_current/0/'
 
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
 
-- project:
-    name: vpp-info
-    project-name: vpp
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-4c-4g
-    project: vpp
-    branch: master
+- 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.
+      # Not sure whether not failing has any useful usage,
+      # but it does not hurt to have some flexibility for future.
+      - csit-fail-on-crc-mismatch-parameter:
+          fail-on-crc-mismatch: '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: 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:
+          - ../scripts/vpp/check_crc.sh
+      # TODO: Add sending e-mail notifications to vpp-api-dev@lists.fd.io
+
+    publishers:
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn36'