Merge "Update vpp non-voting jobs to use new jenkins labels"

2 files changed, 21 insertions, 13 deletions

diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml
index c9db4cc1..84ed58c8 100644
--- a/jjb/vpp/docs.yaml
+++ b/jjb/vpp/docs.yaml
@@ -8,7 +8,7 @@
       - 'vpp-make-test-docs-verify-{stream}'
 
     project: 'vpp'
-    node-arch: 'x86_64'
+    executor-arch: 'x86_64'
     os: 'ubuntu1804'
 
     stream:
@@ -30,7 +30,7 @@
       - 'vpp-sphinx-docs-verify-{stream}'
 
     project: 'vpp'
-    node-arch: 'x86_64'
+    executor-arch: 'x86_64'
     os: 'ubuntu1804'
 
     stream:
@@ -41,7 +41,7 @@
     name: 'vpp-docs-verify-{stream}'
 
     project-type: freestyle
-    node: 'builder-{os}-prod-{node-arch}'
+    node: 'builder-{os}-prod-{executor-arch}'
     concurrent: true
     allow-empty: 'true'
     fingerprint: false
@@ -108,7 +108,7 @@
     name: 'vpp-docs-merge-{stream}'
 
     project-type: freestyle
-    node: 'builder-{os}-prod-{node-arch}'
+    node: 'builder-{os}-prod-{executor-arch}'
     concurrent: false
     archive-artifacts: '**/build-root/docs/html/*'
     allow-empty: 'true'
@@ -194,7 +194,7 @@
     name: 'vpp-sphinx-docs-verify-{stream}'
 
     project-type: freestyle
-    node: 'builder-{os}-prod-{node-arch}'
+    node: 'builder-{os}-prod-{executor-arch}'
     concurrent: true
     allow-empty: 'true'
     fingerprint: false
@@ -274,7 +274,7 @@
     name: 'vpp-sphinx-docs-merge-{stream}'
 
     project-type: freestyle
-    node: 'builder-{os}-prod-{node-arch}'
+    node: 'builder-{os}-prod-{executor-arch}'
     concurrent: false
     archive-artifacts: 'docs/_build/html/*'
     allow-empty: 'true'
@@ -352,7 +352,7 @@
     name: 'vpp-make-test-docs-verify-{stream}'
 
     project-type: freestyle
-    node: 'builder-{os}-prod-{node-arch}'
+    node: 'builder-{os}-prod-{executor-arch}'
     concurrent: true
     allow-empty: 'true'
     fingerprint: false
@@ -419,7 +419,7 @@
     name: 'vpp-make-test-docs-merge-{stream}'
 
     project-type: freestyle
-    node: 'builder-{os}-prod-{node-arch}'
+    node: 'builder-{os}-prod-{executor-arch}'
     concurrent: false
     archive-artifacts: '**/build-root/build-test/doc/html/*'
     allow-empty: 'true'
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 2245a6c6..546f54b7 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -7,6 +7,7 @@
       - 'vpp-merge-{stream}-{os}'
 
     project: 'vpp'
+    executor-arch: 'x86_64'
     os:
       - ubuntu1804:
           repo-os-part: 'ubuntu.bionic.main'
@@ -37,6 +38,7 @@
       - 'vpp-beta-merge-{stream}-{os}'
 
     project: 'vpp'
+    executor-arch: 'x86_64'
     os:
       - ubuntu2004:
           repo-os-part: 'ubuntu.focal.main'
@@ -47,12 +49,16 @@
       - master:
           branch: 'master'
           repo-stream-part: 'master'
+      - '2009':
+          branch: 'stable/2009'
+          repo-stream-part: 'stable.2009'
 
 - project:
     name: vpp-misc
     jobs:
       - 'vpp-checkstyle-verify-{stream}'
     project: 'vpp'
+    executor-arch: 'x86_64'
     stream:
       - master:
           branch: 'master'
@@ -69,7 +75,7 @@
       - '2009':
           branch: 'stable/2009'
           repo-stream-part: 'stable.2009'
-    os: ubuntu1804
+    os: 'ubuntu1804'
 
 - project:
     name: vpp-perpatch
@@ -121,6 +127,7 @@
       - 'vpp-arm-verify-{stream}-{os}'
       - 'vpp-arm-merge-{stream}-{os}'
     project: 'vpp'
+    executor-arch: 'aarch64'
     stream:
       - master:
           branch: 'master'
@@ -325,7 +332,7 @@
     name: 'vpp-checkstyle-verify-{stream}'
 
     project-type: freestyle
-    node: '{os}-us'
+    node: 'builder-{os}-prod-{executor-arch}'
     concurrent: true
     archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
 
@@ -433,7 +440,7 @@
     name: 'vpp-beta-verify-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-us'
+    node: 'builder-{os}-prod-{executor-arch}'
     concurrent: true
     archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
 
@@ -460,6 +467,7 @@
           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:
@@ -559,7 +567,7 @@
     name: 'vpp-verify-{stream}-debug'
 
     project-type: freestyle
-    node: 'ubuntu1804-us'
+    node: 'builder-{os}-prod-{executor-arch}'
     concurrent: true
     archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
 
@@ -700,7 +708,7 @@
     name: 'vpp-beta-merge-{stream}-{os}'
 
     project-type: freestyle
-    node: '{os}-us'
+    node: 'builder-{os}-prod-{executor-arch}'
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'