Recycle vpp-verify-{stream}-clang into vpp-verify-{stream}-debug job

[ci-management.git] / jjb / vpp / vpp.yaml

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index a80043d..bfd0ddd 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -3,6 +3,7 @@
     name: vpp
     jobs:
       - 'vpp-verify-{stream}-{os}'
+      - 'vpp-verify-{stream}-debug'
       - 'vpp-merge-{stream}-{os}'
 
     project: 'vpp'
@@ -25,6 +26,9 @@
       - '2001':
           branch: 'stable/2001'
           repo-stream-part: 'stable.2001'
+      - '2005':
+          branch: 'stable/2005'
+          repo-stream-part: 'stable.2005'
 - project:
     name: vpp-beta
     jobs:
@@ -46,7 +50,6 @@
 - project:
     name: vpp-clang
     jobs:
-      - 'vpp-verify-{stream}-clang'
       - 'vpp-coverity-{stream}'
 
     project: 'vpp'
@@ -84,12 +87,16 @@
       - '2001':
           branch: 'stable/2001'
           repo-stream-part: 'stable.2001'
+      - '2005':
+          branch: 'stable/2005'
+          repo-stream-part: 'stable.2005'
     os: ubuntu1804
 
 - project:
     name: vpp-perpatch
     jobs:
-      - 'vpp-csit-verify-device-{stream}-{device-node-arch}'
+      - 'vpp-csit-verify-device-{stream}-{device-node-arch}':
+          make-parallel-jobs: '32'
       - 'vpp-csit-verify-perf-{stream}-{node-arch}'
     project: 'vpp'
     os: ubuntu1804
@@ -110,6 +117,9 @@
       - '2001':
           branch: 'stable/2001'
           repo-stream-part: 'stable.2001'
+      - '2005':
+          branch: 'stable/2005'
+          repo-stream-part: 'stable.2005'
     device-node-arch:
       - 1n-skx
       - 1n-tx2:
@@ -124,6 +134,7 @@
       - 3n-dnv
       - 3n-tsh:
           executor: 'ubuntu1804arm-s'
+          make-parallel-jobs: '16'
     exclude:
       - stream: '1904'
         os: 'ubuntu1804'
@@ -174,9 +185,13 @@
       - '2001':
           branch: 'stable/2001'
           repo-stream-part: 'stable.2001'
+      - '2005':
+          branch: 'stable/2005'
+          repo-stream-part: 'stable.2005'
     os:
       - ubuntu1804:
           repo-os-part: 'ubuntu-arm.bionic.main'
+    make-parallel-jobs: '16'
 
 # TODO: Merge with (e.g.) vpp-perpatch or similar,
 # when number of stable branches supported matches.
@@ -201,7 +216,7 @@
     project-name: vpp
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-4c-4g
+    build-node: centos7-builder-2c-2g
     project: vpp
     branch: master
 
@@ -245,6 +260,8 @@
           name: ARCHIVE_ARTIFACTS
           default: '{archive-artifacts}'
           description: Artifacts to archive to the logs server.
+      - make-parallel-jobs-parameter:
+          make-parallel-jobs: '{make-parallel-jobs}'
 
     scm:
       - gerrit-trigger-scm:
@@ -302,6 +319,8 @@
           name: ARCHIVE_ARTIFACTS
           default: '{archive-artifacts}'
           description: Artifacts to archive to the logs server.
+      - make-parallel-jobs-parameter:
+          make-parallel-jobs: '{make-parallel-jobs}'
 
     scm:
       - gerrit-trigger-scm:
@@ -376,6 +395,9 @@
           name: ARCHIVE_ARTIFACTS
           default: '{archive-artifacts}'
           description: Artifacts to archive to the logs server.
+      - make-parallel-jobs-parameter:
+          make-parallel-jobs: '{make-parallel-jobs}'
+      - gerrit-refspec-parameter
 
     scm:
       - gerrit-trigger-scm:
@@ -401,8 +423,6 @@
           - ../scripts/setup_vpp_dpdk_dev_env.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:
@@ -440,6 +460,8 @@
           name: ARCHIVE_ARTIFACTS
           default: '{archive-artifacts}'
           description: Artifacts to archive to the logs server.
+      - make-parallel-jobs-parameter:
+          make-parallel-jobs: '{make-parallel-jobs}'
 
     scm:
       - gerrit-trigger-scm:
@@ -473,8 +495,6 @@
           - ../scripts/setup_vpp_dpdk_dev_env.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:
@@ -511,6 +531,7 @@
           os: '{os}'
       - repo-name-parameter:
           repo-name: '{repo-stream-part}.ubuntu.bionic.main'
+      - gerrit-refspec-parameter
 
     scm:
       - gerrit-trigger-scm:
@@ -521,6 +542,11 @@
     wrappers:
       - fdio-infra-wrappers:
           build-timeout: '{build-timeout}'
+      - credentials-binding:
+          - text:
+              credential-id: VppApiCompatNotify
+              variable: SECRET_WEBEX_TEAMS_ACCESS_TOKEN
+
 
     triggers:
       - gerrit:
@@ -580,6 +606,9 @@
       - shell:
           !include-raw-escape:
           - ../scripts/vpp/test-checkstyle.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/vpp/api-checkstyle.sh
       - shell:
           !include-raw-escape:
           - ../scripts/vpp/commitmsg.sh
@@ -617,6 +646,8 @@
           name: ARCHIVE_ARTIFACTS
           default: '{archive-artifacts}'
           description: Artifacts to archive to the logs server.
+      - make-parallel-jobs-parameter:
+          make-parallel-jobs: '{make-parallel-jobs}'
 
     scm:
       - gerrit-trigger-scm:
@@ -678,6 +709,9 @@
           name: ARCHIVE_ARTIFACTS
           default: '{archive-artifacts}'
           description: Artifacts to archive to the logs server.
+      - make-parallel-jobs-parameter:
+          make-parallel-jobs: '{make-parallel-jobs}'
+      - gerrit-refspec-parameter
 
     scm:
       - gerrit-trigger-scm:
@@ -710,7 +744,7 @@
           maven-version: 'mvn36'
 
 - job-template:
-    name: 'vpp-verify-{stream}-clang'
+    name: 'vpp-verify-{stream}-debug'
 
     project-type: freestyle
     node: 'ubuntu1804-us'
@@ -734,6 +768,9 @@
           repo-name: '{repo-stream-part}.ubuntu.bionic.main'
       - stream-parameter:
           stream: '{stream}'
+      - make-parallel-jobs-parameter:
+          make-parallel-jobs: '{make-parallel-jobs}'
+      - gerrit-refspec-parameter
 
     scm:
       - gerrit-trigger-scm:
@@ -746,7 +783,7 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - gerrit-trigger-checkstyle:
+      - gerrit-trigger-checkstyle-nonvoting:
           name: '{project}'
           branch: '{branch}'
 
@@ -759,7 +796,7 @@
           - ../scripts/setup_vpp_dpdk_dev_env.sh
       - shell:
           !include-raw-escape:
-          - ../scripts/vpp/clang-build.sh
+          - ../scripts/vpp/debug-build.sh
 
     publishers:
       - fdio-infra-shiplogs:
@@ -895,6 +932,8 @@
           name: ARCHIVE_ARTIFACTS
           default: '{archive-artifacts}'
           description: Artifacts to archive to the logs server.
+      - make-parallel-jobs-parameter:
+          make-parallel-jobs: '{make-parallel-jobs}'
 
     scm:
       - gerrit-trigger-scm:
@@ -974,6 +1013,8 @@
           name: ARCHIVE_ARTIFACTS
           default: '{archive-artifacts}'
           description: Artifacts to archive to the logs server.
+      - make-parallel-jobs-parameter:
+          make-parallel-jobs: '{make-parallel-jobs}'
 
     scm:
       - gerrit-trigger-scm:
@@ -1064,6 +1105,8 @@
           name: ARCHIVE_ARTIFACTS
           default: '{archive-artifacts}'
           description: Artifacts to archive to the logs server.
+      - make-parallel-jobs-parameter:
+          make-parallel-jobs: '{make-parallel-jobs}'
 
     scm:
       - gerrit-trigger-scm:
@@ -1150,6 +1193,8 @@
           name: ARCHIVE_ARTIFACTS
           default: '{archive-artifacts}'
           description: Artifacts to archive to the logs server.
+      - make-parallel-jobs-parameter:
+          make-parallel-jobs: '{make-parallel-jobs}'
 
     scm:
       - gerrit-trigger-scm: