chore(post-release-cleanup): clean up VPP CI jobs post VPP 23.10 release

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

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 3bacf3b..03e3cbb 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -34,29 +34,18 @@
       - 'vpp-checkstyle-verify-{stream}-{os}-{executor-arch}'
     project: 'vpp'
     os:
-      - ubuntu2004
       - ubuntu2204
     stream:
       - 'master':
           branch: 'master'
           branch-refspec: ''
-      - '2302':
-          branch: 'stable/2302'
-          branch-refspec: ''
       - '2306':
           branch: 'stable/2306'
           branch-refspec: ''
+      - '2310':
+          branch: 'stable/2310'
+          branch-refspec: ''
     executor-arch: 'x86_64'
-    exclude:
-      # os deprecated in 23.06
-      - stream: '2306'
-        os: 'ubuntu2004'
-      # os deprecated in 23.02
-      - stream: '2302'
-        os: 'ubuntu2004'
-      # os deprecated in master
-      - stream: 'master'
-        os: 'ubuntu2004'
 
 # [end] VPP-CHECKSTYLE-X86_64 PROJECT
 
@@ -82,13 +71,13 @@
           branch-refspec: ''
           make-test-os: 'ubuntu-20.04 ubuntu-22.04'
           make-test-multiworker-os: 'debian-11'
-      - '2302':
-          branch: 'stable/2302'
+      - '2306':
+          branch: 'stable/2306'
           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'
@@ -107,29 +96,18 @@
     project: 'vpp'
     make-parallel-jobs: '4'
     os:
-      - ubuntu2004
       - ubuntu2204
     executor-arch: 'x86_64'
     stream:
       - 'master':
           branch: 'master'
           branch-refspec: ''
-      - '2302':
-          branch: 'stable/2302'
-          branch-refspec: ''
       - '2306':
           branch: 'stable/2306'
           branch-refspec: ''
-    exclude:
-      # os deprecated in 23.06
-      - stream: '2306'
-        os: 'ubuntu2004'
-      # os deprecated in 23.02
-      - stream: '2302'
-        os: 'ubuntu2004'
-      # os deprecated in master
-      - stream: 'master'
-        os: 'ubuntu2004'
+      - '2310':
+          branch: 'stable/2310'
+          branch-refspec: ''
 
 # [end] VPP-GCC-X86_64 PROJECT
 
@@ -194,7 +172,7 @@
     project: 'vpp'
     make-parallel-jobs: '4'
     make-test-os: 'ubuntu-20.04 ubuntu-22.04'
-    comment-trigger-value: 'cov-verify'
+    comment-trigger-value: 'gcov-report'
     stream:
       - 'master':
           branch: 'master'
@@ -228,13 +206,13 @@
           branch-refspec: ''
           make-test-os: 'ubuntu-20.04 ubuntu-22.04'
           make-test-multiworker-os: ''
-      - '2302':
-          branch: 'stable/2302'
+      - '2306':
+          branch: 'stable/2306'
           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: ''
@@ -256,16 +234,17 @@
       - 'master':
           branch: 'master'
           branch-refspec: ''
-      - '2302':
-          branch: 'stable/2302'
-          branch-refspec: ''
       - '2306':
           branch: 'stable/2306'
           branch-refspec: ''
+      - '2310':
+          branch: 'stable/2310'
+          branch-refspec: ''
     testbed-arch:
-      - 1n-skx:
+      - 1n-spr:
           os: 'ubuntu2204'
           executor-arch: 'x86_64'
+          skip-vote: 'true'
       - 1n-tx2:
           os: 'ubuntu2204'
           executor-arch: 'aarch64'
@@ -314,6 +293,15 @@
       - 3n-snr:
           os: 'ubuntu2204'
           executor-arch: 'x86_64'
+      - 3n-icxd:
+          os: 'ubuntu2204'
+          executor-arch: 'x86_64'
+      - 3na-spr:
+          os: 'ubuntu2204'
+          executor-arch: 'x86_64'
+      - 3nb-spr:
+          os: 'ubuntu2204'
+          executor-arch: 'x86_64'
 # [end] VPP-CSIT-VERIFY-PERF PROJECT
 
 # VPP-CSIT-API-CRC PROJECT
@@ -331,12 +319,12 @@
       - 'master':
           branch: 'master'
           branch-refspec: ''
-      - '2302':
-          branch: 'stable/2302'
-          branch-refspec: ''
       - '2306':
           branch: 'stable/2306'
           branch-refspec: ''
+      - '2310':
+          branch: 'stable/2310'
+          branch-refspec: ''
     os:
       - 'ubuntu2204'
 # [end] VPP-CSIT-API-CRC PROJECT