Merge "Move VPP and CSIT macros to global"

diff --git a/jjb/ci-management/ci-management-jobs.yaml b/jjb/ci-management/ci-management-jobs.yaml
index f102036..b071cb9 100644 (file)
--- a/jjb/ci-management/ci-management-jobs.yaml
+++ b/jjb/ci-management/ci-management-jobs.yaml
@@ -2,7 +2,11 @@
 - project:
     name: ci-management-ci-jobs
     jobs:
-      - '{project-name}-ci-jobs'
+      - gerrit-jenkins-cfg-verify
+      - gerrit-jenkins-sandbox-cleanup
+      - gerrit-jjb-deploy-job
+      - gerrit-jjb-merge
+      - gerrit-jjb-verify
 
     project: ci-management
     project-name: ci-management

diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml
index d9263a4..f18a596 100644 (file)
--- a/jjb/csit/csit-perf.yaml
+++ b/jjb/csit/csit-perf.yaml
@@ -60,15 +60,15 @@
       - master:
           branch: 'master'
           branch-id: 'oper'
-          executor: 'ubuntu1804-us'
       - '1904':
           branch: 'rls1904'
           branch-id: 'oper-rls1904'
-          executor: 'ubuntu1804-us'
       - '1908_1':
           branch: 'rls1908_1'
           branch-id: 'oper-rls1908_1'
-          executor: 'ubuntu1804-us'
+      - '2001':
+          branch: 'rls2001'
+          branch-id: 'oper-rls2001'
 
     build-artifact-num-to-keep: 10
     node-arch:

diff --git a/jjb/csit/csit-tox.yaml b/jjb/csit/csit-tox.yaml
index e83ce94..9c54cd1 100644 (file)
--- a/jjb/csit/csit-tox.yaml
+++ b/jjb/csit/csit-tox.yaml
@@ -27,6 +27,8 @@
           branch: 'rls1904'
       - '1908_1':
           branch: 'rls1908_1'
+      - '2001':
+          branch: 'rls2001'
 
 - job-template:
     name: 'csit-verify-tox-{stream}'

diff --git a/jjb/csit/csit-vpp-device.yaml b/jjb/csit/csit-vpp-device.yaml
index 3c713d0..9fb768a 100644 (file)
--- a/jjb/csit/csit-vpp-device.yaml
+++ b/jjb/csit/csit-vpp-device.yaml
@@ -39,6 +39,9 @@
       - master:
           branch: 'master'
           branch-id: 'oper'
+      - '2001':
+          branch: 'rls2001'
+          branch-id: 'oper-rls2001'
     stream:
       - master:
           branch: 'master'
@@ -49,6 +52,9 @@
       - '1908':
           branch: 'rls1908_1'
           branch-id: 'oper-rls1908_1'
+      - '2001':
+          branch: 'rls2001'
+          branch-id: 'oper-rls2001'
     exclude:
       - stream: '1904'
         os: 'ubuntu1804'

diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index ad6689c..5de96f9 100644 (file)
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -29,18 +29,19 @@
     stream_timed:
       - master:
           branch: 'master'
-          executor: 'ubuntu1804-us'
+      - '2001':
+          branch: 'rls2001'
     stream:
       - master:
           branch: 'master'
-          executor: 'ubuntu1804-us'
       - '1904':
           branch: 'rls1904'
-          executor: 'ubuntu1804-us'
       - '1908':
           branch: 'rls1908'
       - '1908_1':
           branch: 'rls1908_1'
+      - '2001':
+          branch: 'rls2001'
 
 - project:
     name: csit-view
@@ -89,7 +90,7 @@
 
     triggers:
       - reverse:
-          jobs: 'csit-vpp-verify-{stream_timed}-ubuntu1604-weekly'
+          jobs: 'csit-vpp-device-{stream_timed}-ubuntu1804-1n-skx-weekly'
           result: 'success'
       - gerrit:
           server-name: 'Primary'

diff --git a/jjb/scripts/vpp/arm-build-no-test.sh b/jjb/scripts/vpp/arm-build-no-test.sh
index 94cc824..ae5aa34 100644 (file)
--- a/jjb/scripts/vpp/arm-build-no-test.sh
+++ b/jjb/scripts/vpp/arm-build-no-test.sh
@@ -1,4 +1,10 @@
 #!/bin/bash
+
+# This script wants environment variables
+# set by parallel-vars.sh script.
+# Otherwise "make test" is not parallelized,
+# possibly leading to jobs overstepping their time limit.
+
 # basic build script example
 set -xe -o pipefail
 

diff --git a/jjb/scripts/vpp/arm-build.sh b/jjb/scripts/vpp/arm-build.sh
index 9de736a..2abe610 100644 (file)
--- a/jjb/scripts/vpp/arm-build.sh
+++ b/jjb/scripts/vpp/arm-build.sh
@@ -1,4 +1,10 @@
 #!/bin/bash
+
+# This script wants environment variables
+# set by parallel-vars.sh script.
+# Otherwise "make test" is not parallelized,
+# possibly leading to jobs overstepping their time limit.
+
 # basic build script example
 set -xe -o pipefail
 

diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml
index c34387e..f5ba7ee 100644 (file)
--- a/jjb/vpp/docs.yaml
+++ b/jjb/vpp/docs.yaml
@@ -25,6 +25,9 @@
       - '1908':
           branch: 'stable/1908'
           repo-stream-part: 'stable.1908'
+      - '2001':
+          branch: 'stable/2001'
+          repo-stream-part: 'stable.2001'
 
     type:
       - short

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 5f9d7c8..1b08c06 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -22,6 +22,9 @@
       - '1908':
           branch: 'stable/1908'
           repo-stream-part: 'stable.1908'
+      - '2001':
+          branch: 'stable/2001'
+          repo-stream-part: 'stable.2001'
 
 - project:
     name: vpp-clang
@@ -61,6 +64,9 @@
       - '1908':
           branch: 'stable/1908'
           repo-stream-part: 'stable.1908'
+      - '2001':
+          branch: 'stable/2001'
+          repo-stream-part: 'stable.2001'
     os: ubuntu1804
 
 - project:
@@ -84,6 +90,9 @@
       - '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:
@@ -119,6 +128,9 @@
       - '1908':
           branch: 'stable/1908'
           repo-stream-part: 'stable.1908'
+      - '2001':
+          branch: 'stable/2001'
+          repo-stream-part: 'stable.2001'
     os:
       - ubuntu1604:
           repo-os-part: 'ubuntu.xenial.main'
@@ -142,6 +154,9 @@
       - '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'
@@ -371,8 +386,7 @@
       - shell:
           !include-raw-escape:
           - ../scripts/vpp/parallel-vars.sh
-      - shell:
-          !include-raw-escape:
+          # Do not split, the line below wants env vars from the line above.
           - ../scripts/vpp/arm-build.sh
 
     publishers:
@@ -448,8 +462,7 @@
       - shell:
           !include-raw-escape:
           - ../scripts/vpp/parallel-vars.sh
-      - shell:
-          !include-raw-escape:
+          # Do not split, the line below wants env vars from the line above.
           - ../scripts/vpp/arm-build-no-test.sh
 
       - provide-maven-settings:
@@ -938,9 +951,6 @@
       - shell:
           !include-raw-escape:
           - ../scripts/setup_vpp_dpdk_dev_env.sh
-      - shell:
-          !include-raw-escape:
-          - ../scripts/vpp/parallel-vars.sh
       - shell:
           !include-raw-escape:
           - ../scripts/vpp/csit-device.sh