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

- Remove references to unsupported VPP 23.02 release

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

diff --git a/docker/scripts/lib_vpp.sh b/docker/scripts/lib_vpp.sh
index 60d4e4b..312bbf7 100644 (file)
--- a/docker/scripts/lib_vpp.sh
+++ b/docker/scripts/lib_vpp.sh
@@ -96,7 +96,7 @@ docker_build_setup_vpp() {
 #       to create an enumerated set of jobs jobs that match the
 #       definitions here.
 declare -A VPP_BRANCHES
-VPP_BRANCHES["debian-11"]="stable/2302 stable/2306 stable/2310 master"
-VPP_BRANCHES["ubuntu-20.04"]="stable/2302 stable/2306 stable/2310 master"
-VPP_BRANCHES["ubuntu-22.04"]="stable/2302 stable/2306 stable/2310 master"
+VPP_BRANCHES["debian-11"]="stable/2306 stable/2310 master"
+VPP_BRANCHES["ubuntu-20.04"]="stable/2306 stable/2310 master"
+VPP_BRANCHES["ubuntu-22.04"]="stable/2306 stable/2310 master"
 export VPP_BRANCHES

diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml
index 80d2ad6..86bf8f4 100644 (file)
--- a/jjb/vpp/docs.yaml
+++ b/jjb/vpp/docs.yaml
@@ -10,35 +10,17 @@
     project: 'vpp'
     executor-arch: 'x86_64'
     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: ''
-    exclude:
-      # os deprecated in 23.10
-      - stream: '2310'
-        os: 'ubuntu2004'
-      # 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'
-      # os added in 22.10
 
 - job-template:
     name: 'vpp-docs-verify-{stream}-{os}-{executor-arch}'

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index df4638a..03e3cbb 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -34,15 +34,11 @@
       - '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: ''
@@ -50,19 +46,6 @@
           branch: 'stable/2310'
           branch-refspec: ''
     executor-arch: 'x86_64'
-    exclude:
-      # os deprecated in 23.10
-      - stream: '2310'
-        os: 'ubuntu2004'
-      # 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
 
@@ -88,11 +71,6 @@
           branch-refspec: ''
           make-test-os: 'ubuntu-20.04 ubuntu-22.04'
           make-test-multiworker-os: 'debian-11'
-      - '2302':
-          branch: 'stable/2302'
-          branch-refspec: ''
-          make-test-os: 'ubuntu-20.04 ubuntu-22.04'
-          make-test-multiworker-os: 'debian-11'
       - '2306':
           branch: 'stable/2306'
           branch-refspec: ''
@@ -118,35 +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: ''
       - '2310':
           branch: 'stable/2310'
           branch-refspec: ''
-    exclude:
-      # os deprecated in 23.10
-      - stream: '2310'
-        os: 'ubuntu2004'
-      # 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-GCC-X86_64 PROJECT
 
@@ -245,11 +206,6 @@
           branch-refspec: ''
           make-test-os: 'ubuntu-20.04 ubuntu-22.04'
           make-test-multiworker-os: ''
-      - '2302':
-          branch: 'stable/2302'
-          branch-refspec: ''
-          make-test-os: 'ubuntu-20.04 ubuntu-22.04'
-          make-test-multiworker-os: ''
       - '2306':
           branch: 'stable/2306'
           branch-refspec: ''
@@ -278,9 +234,6 @@
       - 'master':
           branch: 'master'
           branch-refspec: ''
-      - '2302':
-          branch: 'stable/2302'
-          branch-refspec: ''
       - '2306':
           branch: 'stable/2306'
           branch-refspec: ''
@@ -366,9 +319,6 @@
       - 'master':
           branch: 'master'
           branch-refspec: ''
-      - '2302':
-          branch: 'stable/2302'
-          branch-refspec: ''
       - '2306':
           branch: 'stable/2306'
           branch-refspec: ''