Support ubuntu-22.04 docker exector image building & vpp jobs

Change-Id: I71b654cd072288e4ede70285a0740a7f18caa299
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>

diff --git a/docker/scripts/lib_common.sh b/docker/scripts/lib_common.sh
index 69587f6..f4eec96 100644 (file)
--- a/docker/scripts/lib_common.sh
+++ b/docker/scripts/lib_common.sh
@@ -156,12 +156,12 @@ export EXECUTOR_CLASS_ARCH="$EXECUTOR_DEFAULT_CLASS-$OS_ARCH"
 export EXECUTOR_CLASSES="$EXECUTOR_DEFAULT_CLASS csit_dut csit_shim"
 export EXECUTOR_ARCHS="aarch64 x86_64"
 declare -A EXECUTOR_CLASS_ARCH_OS_NAMES
-EXECUTOR_CLASS_ARCH_OS_NAMES["builder-aarch64"]="ubuntu-20.04"
-EXECUTOR_CLASS_ARCH_OS_NAMES["builder-x86_64"]="debian-10 debian-11 ubuntu-20.04"
-EXECUTOR_CLASS_ARCH_OS_NAMES["csit_dut-aarch64"]="ubuntu-20.04"
-EXECUTOR_CLASS_ARCH_OS_NAMES["csit_dut-x86_64"]="ubuntu-20.04"
-EXECUTOR_CLASS_ARCH_OS_NAMES["csit_shim-aarch64"]="ubuntu-20.04"
-EXECUTOR_CLASS_ARCH_OS_NAMES["csit_shim-x86_64"]="ubuntu-20.04"
+EXECUTOR_CLASS_ARCH_OS_NAMES["builder-aarch64"]="ubuntu-20.04 ubuntu-22.04"
+EXECUTOR_CLASS_ARCH_OS_NAMES["builder-x86_64"]="debian-10 debian-11 ubuntu-20.04 ubuntu-22.04"
+EXECUTOR_CLASS_ARCH_OS_NAMES["csit_dut-aarch64"]="ubuntu-22.04"
+EXECUTOR_CLASS_ARCH_OS_NAMES["csit_dut-x86_64"]="ubuntu-22.04"
+EXECUTOR_CLASS_ARCH_OS_NAMES["csit_shim-aarch64"]="ubuntu-22.04"
+EXECUTOR_CLASS_ARCH_OS_NAMES["csit_shim-x86_64"]="ubuntu-22.04"
 export EXECUTOR_CLASS_ARCH_OS_NAMES
 
 executor_list_roles() {

diff --git a/docker/scripts/lib_csit.sh b/docker/scripts/lib_csit.sh
index 31afde0..525e748 100644 (file)
--- a/docker/scripts/lib_csit.sh
+++ b/docker/scripts/lib_csit.sh
@@ -34,7 +34,8 @@ csit_supported_executor_class() {
 
 csit_supported_os() {
     case "$1" in
-        ubuntu-20.04) return 0 ;;
+        # TODO: fix to be only ubuntu-22.04 once migration is complete.
+        ubuntu-2[02].04) return 0 ;;
                    *) ;;
     esac
     return 1

diff --git a/docker/scripts/lib_vpp.sh b/docker/scripts/lib_vpp.sh
index 5353b63..8f1b8f1 100644 (file)
--- a/docker/scripts/lib_vpp.sh
+++ b/docker/scripts/lib_vpp.sh
@@ -99,4 +99,5 @@ declare -A VPP_BRANCHES
 VPP_BRANCHES["debian-10"]="stable/2202 stable/2206 master"
 VPP_BRANCHES["debian-11"]="stable/2206 master"
 VPP_BRANCHES["ubuntu-20.04"]="stable/2202 stable/2206 master"
+VPP_BRANCHES["ubuntu-22.04"]="master"
 export VPP_BRANCHES

diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml
index 0526838..015eaf8 100644 (file)
--- a/jjb/vpp/docs.yaml
+++ b/jjb/vpp/docs.yaml
@@ -7,10 +7,11 @@
 
     project: 'vpp'
     executor-arch: 'x86_64'
-    os: 'ubuntu2004'
-
+    os:
+      - 'ubuntu2004'
+      - 'ubuntu2204'
     stream:
-      - master:
+      - 'master':
           branch: 'master'
           branch-refspec: ''
       - '2202':
@@ -19,6 +20,16 @@
       - '2206':
           branch: 'stable/2206'
           branch-refspec: ''
+    exclude:
+      # os deprecated in master (22.10)
+      - stream: 'master'
+        os: 'ubuntu2004'
+      # os added in 22.10
+      - stream: '2202'
+        os: 'ubuntu2204'
+      # os added in 22.10
+      - stream: '2206'
+        os: 'ubuntu2204'
 
 - job-template:
     name: 'vpp-docs-verify-{stream}-{os}-{executor-arch}'

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index f290ba3..24e6e89 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -33,9 +33,11 @@
     jobs:
       - 'vpp-checkstyle-verify-{stream}-{os}-{executor-arch}'
     project: 'vpp'
-    os: 'ubuntu2004'
+    os:
+      - ubuntu2004
+      - ubuntu2204
     stream:
-      - master:
+      - 'master':
           branch: 'master'
           branch-refspec: ''
       - '2202':
@@ -45,6 +47,16 @@
           branch: 'stable/2206'
           branch-refspec: ''
     executor-arch: 'x86_64'
+    exclude:
+      # os deprecated in master (22.10)
+      - stream: 'master'
+        os: 'ubuntu2004'
+      # os added in 22.10
+      - stream: '2202'
+        os: 'ubuntu2204'
+      # os added in 22.10
+      - stream: '2206'
+        os: 'ubuntu2204'
 # [end] VPP-CHECKSTYLE-X86_64 PROJECT
 
 # VPP-X86_64 PROJECT
@@ -65,7 +77,7 @@
     make-parallel-jobs: '4'
     make-test-os: 'ubuntu-20.04'
     stream:
-      - master:
+      - 'master':
           branch: 'master'
           branch-refspec: ''
       - '2202':
@@ -78,11 +90,18 @@
       - debian10
       - debian11
       - ubuntu2004
+      - ubuntu2204
     executor-arch: 'x86_64'
     exclude:
       # os added in 22.06
       - stream: '2202'
         os: 'debian11'
+      # os added in 22.10
+      - stream: '2202'
+        os: 'ubuntu2204'
+      # os added in 22.10
+      - stream: '2206'
+        os: 'ubuntu2204'
 # [end] VPP-X86_64 PROJECT
 
 # VPP-DEBUG-X86_64 PROJECT
@@ -100,13 +119,14 @@
     make-test-os: 'ubuntu-20.04'
     comment-trigger-value: 'debug-verify'
     stream:
-      - master:
+      - 'master':
           branch: 'master'
           branch-refspec: ''
           # Once per hour
           periodicity: 'H * * * *'
-    os: 'ubuntu2004'
+    os: 'ubuntu2204'
     executor-arch: 'x86_64'
+
 # [end] VPP-DEBUG-X86_64 PROJECT
 
 # VPP-GCC-X86_64 PROJECT
@@ -115,10 +135,12 @@
     jobs:
       - 'vpp-gcc-verify-{stream}-{os}-{executor-arch}'
     project: 'vpp'
+    os:
+      - ubuntu2004
+      - ubuntu2204
     executor-arch: 'x86_64'
-    os: 'ubuntu2004'
     stream:
-      - master:
+      - 'master':
           branch: 'master'
           branch-refspec: ''
       - '2202':
@@ -127,6 +149,16 @@
       - '2206':
           branch: 'stable/2206'
           branch-refspec: ''
+    exclude:
+      # os deprecated in master (22.10)
+      - stream: 'master'
+        os: 'ubuntu2004'
+      # os added in 22.10
+      - stream: '2202'
+        os: 'ubuntu2204'
+      # os added in 22.10
+      - stream: '2206'
+        os: 'ubuntu2204'
 # [end] VPP-GCC-X86_64 PROJECT
 
 # VPP-AARCH64 PROJECT
@@ -147,7 +179,7 @@
     make-parallel-jobs: '16'
     make-test-os: 'ubuntu-20.04'
     stream:
-      - master:
+      - 'master':
           branch: 'master'
           branch-refspec: ''
       - '2202':
@@ -158,7 +190,15 @@
           branch-refspec: ''
     os:
       - ubuntu2004
+      - ubuntu2204
     executor-arch: 'aarch64'
+    exclude:
+      # os added in 22.10
+      - stream: '2202'
+        os: 'ubuntu2204'
+      # os added in 22.10
+      - stream: '2206'
+        os: 'ubuntu2204'
 # [end] VPP-AARCH64 PROJECT
 
 # VPP-CSIT-VERIFY-DEVICE PROJECT
@@ -170,15 +210,9 @@
     project: 'vpp'
     skip-vote: 'false'
     stream:
-      - master:
+      - 'master':
           branch: 'master'
           branch-refspec: ''
-      - '2202':
-          branch: 'stable/2202'
-          branch-refspec: ''
-      - '2206':
-          branch: 'stable/2206'
-          branch-refspec: ''
     testbed-arch:
       - 1n-skx:
           os: 'ubuntu2204'
@@ -187,7 +221,6 @@
           os: 'ubuntu2204'
           executor-arch: 'aarch64'
           skip-vote: 'true'
-
 # [end] VPP-CSIT-VERIFY-DEVICE PROJECT
 
 # VPP-CSIT-VERIFY-PERF PROJECT
@@ -198,15 +231,9 @@
     project: 'vpp'
     skip-vote: 'false'
     stream:
-      - master:
+      - 'master':
           branch: 'master'
           branch-refspec: ''
-      - '2202':
-          branch: 'stable/2202'
-          branch-refspec: ''
-      - '2206':
-          branch: 'stable/2206'
-          branch-refspec: ''
     testbed-arch:
       - 2n-icx:
           os: 'ubuntu2204'
@@ -221,10 +248,10 @@
           os: 'ubuntu2204'
           executor-arch: 'x86_64'
       - 2n-dnv:
-          os: 'ubuntu2004'
+          os: 'ubuntu2204'
           executor-arch: 'x86_64'
       - 3n-dnv:
-          os: 'ubuntu2004'
+          os: 'ubuntu2204'
           executor-arch: 'x86_64'
       - 3n-tsh:
           os: 'ubuntu2204'
@@ -239,9 +266,8 @@
           executor-arch: 'aarch64'
           make-parallel-jobs: '16'
       - 3n-snr:
-          os: 'ubuntu2004'
+          os: 'ubuntu2204'
           executor-arch: 'x86_64'
-
 # [end] VPP-CSIT-VERIFY-PERF PROJECT
 
 # VPP-CSIT-API-CRC PROJECT
@@ -256,7 +282,7 @@
     executor-arch: 'x86_64'
     skip-vote: 'false'
     stream:
-      - master:
+      - 'master':
           branch: 'master'
           branch-refspec: ''
       - '2202':
@@ -265,7 +291,19 @@
       - '2206':
           branch: 'stable/2206'
           branch-refspec: ''
-    os: 'ubuntu2004'
+    os:
+      - 'ubuntu2004'
+      - 'ubuntu2204'
+    exclude:
+      # os deprecated in master (22.10)
+      - stream: 'master'
+        os: 'ubuntu2004'
+      # os added in 22.10
+      - stream: '2202'
+        os: 'ubuntu2204'
+      # os added in 22.10
+      - stream: '2206'
+        os: 'ubuntu2204'
 # [end] VPP-CSIT-API-CRC PROJECT
 
 # LF RELENG VPP PROJECTS