Add stable/2402 branch and remove stable/2306 branch to docker executor image scripts

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

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index fde0542..4422988 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -39,12 +39,12 @@
       - 'master':
           branch: 'master'
           branch-refspec: ''
-      - '2306':
-          branch: 'stable/2306'
-          branch-refspec: ''
       - '2310':
           branch: 'stable/2310'
           branch-refspec: ''
+      - '2402':
+          branch: 'stable/2402'
+          branch-refspec: ''
     executor-arch: 'x86_64'
 
 # [end] VPP-CHECKSTYLE-X86_64 PROJECT
@@ -71,13 +71,13 @@
           branch-refspec: ''
           make-test-os: 'ubuntu-20.04 ubuntu-22.04'
           make-test-multiworker-os: 'debian-11'
-      - '2306':
-          branch: 'stable/2306'
+      - '2310':
+          branch: 'stable/2310'
           branch-refspec: ''
           make-test-os: 'ubuntu-20.04 ubuntu-22.04'
           make-test-multiworker-os: 'debian-11'
-      - '2310':
-          branch: 'stable/2310'
+      - '2402':
+          branch: 'stable/2402'
           branch-refspec: ''
           make-test-os: 'ubuntu-20.04 ubuntu-22.04'
           make-test-multiworker-os: 'debian-11'
@@ -102,12 +102,12 @@
       - 'master':
           branch: 'master'
           branch-refspec: ''
-      - '2306':
-          branch: 'stable/2306'
-          branch-refspec: ''
       - '2310':
           branch: 'stable/2310'
           branch-refspec: ''
+      - '2402':
+          branch: 'stable/2402'
+          branch-refspec: ''
 
 # [end] VPP-GCC-X86_64 PROJECT
 
@@ -206,13 +206,13 @@
           branch-refspec: ''
           make-test-os: 'ubuntu-20.04 ubuntu-22.04'
           make-test-multiworker-os: ''
-      - '2306':
-          branch: 'stable/2306'
+      - '2310':
+          branch: 'stable/2310'
           branch-refspec: ''
           make-test-os: 'ubuntu-20.04 ubuntu-22.04'
           make-test-multiworker-os: ''
-      - '2310':
-          branch: 'stable/2310'
+      - '2402':
+          branch: 'stable/2402'
           branch-refspec: ''
           make-test-os: 'ubuntu-20.04 ubuntu-22.04'
           make-test-multiworker-os: ''
@@ -234,21 +234,30 @@
       - 'master':
           branch: 'master'
           branch-refspec: ''
-      - '2306':
-          branch: 'stable/2306'
-          branch-refspec: ''
       - '2310':
           branch: 'stable/2310'
           branch-refspec: ''
+      - '2402':
+          branch: 'stable/2402'
+          branch-refspec: ''
     testbed-arch:
       - 1n-spr:
           os: 'ubuntu2204'
           executor-arch: 'x86_64'
           skip-vote: 'true'
-      - 1n-tx2:
+#      - 1n-tx2:
+#          os: 'ubuntu2204'
+#          executor-arch: 'aarch64'
+#          skip-vote: 'false'
+      - 1n-alt:
           os: 'ubuntu2204'
           executor-arch: 'aarch64'
-          skip-vote: 'false'
+          skip-vote: 'true'
+    exclude:
+      # 1n-alt testbed not supported
+      # in CSIT prior to 2402
+      - testbed-arch: 1n-alt
+        stream: '2310'
 # [end] VPP-CSIT-VERIFY-DEVICE PROJECT
 
 # VPP-CSIT-VERIFY-PERF PROJECT
@@ -320,12 +329,12 @@
       - 'master':
           branch: 'master'
           branch-refspec: ''
-      - '2306':
-          branch: 'stable/2306'
-          branch-refspec: ''
       - '2310':
           branch: 'stable/2310'
           branch-refspec: ''
+      - '2402':
+          branch: 'stable/2402'
+          branch-refspec: ''
     os:
       - 'ubuntu2204'
 # [end] VPP-CSIT-API-CRC PROJECT