post vpp 23.02 release clean up

- Remove stable/2206 branch from jjb definitions
  and docker executor image builder script.

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

diff --git a/docker/scripts/lib_vpp.sh b/docker/scripts/lib_vpp.sh
index 643cb7e..6e211ef 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/2206 stable/2210 stable/2302 master"
-VPP_BRANCHES["ubuntu-20.04"]="stable/2206 stable/2210 stable/2302 master"
+VPP_BRANCHES["debian-11"]="stable/2210 stable/2302 master"
+VPP_BRANCHES["ubuntu-20.04"]="stable/2210 stable/2302 master"
 VPP_BRANCHES["ubuntu-22.04"]="stable/2210 stable/2302 master"
 export VPP_BRANCHES

diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml
index d9eb205..9776217 100644 (file)
--- a/jjb/vpp/docs.yaml
+++ b/jjb/vpp/docs.yaml
@@ -14,9 +14,6 @@
       - 'master':
           branch: 'master'
           branch-refspec: ''
-      - '2206':
-          branch: 'stable/2206'
-          branch-refspec: ''
       - '2210':
           branch: 'stable/2210'
           branch-refspec: ''
@@ -34,8 +31,6 @@
       - stream: 'master'
         os: 'ubuntu2004'
       # 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 3431186..ade6162 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -40,9 +40,6 @@
       - 'master':
           branch: 'master'
           branch-refspec: ''
-      - '2206':
-          branch: 'stable/2206'
-          branch-refspec: ''
       - '2210':
           branch: 'stable/2210'
           branch-refspec: ''
@@ -60,9 +57,7 @@
       # os deprecated in master
       - stream: 'master'
         os: 'ubuntu2004'
-      # os added in 22.10
-      - stream: '2206'
-        os: 'ubuntu2204'
+
 # [end] VPP-CHECKSTYLE-X86_64 PROJECT
 
 # VPP-X86_64 PROJECT
@@ -87,11 +82,6 @@
           branch-refspec: ''
           make-test-os: 'ubuntu-20.04 ubuntu-22.04'
           make-test-multiworker-os: 'debian-11'
-      - '2206':
-          branch: 'stable/2206'
-          branch-refspec: ''
-          make-test-os: 'ubuntu-20.04'
-          make-test-multiworker-os: 'debian-11'
       - '2210':
           branch: 'stable/2210'
           branch-refspec: ''
@@ -107,10 +97,6 @@
       - ubuntu2004
       - ubuntu2204
     executor-arch: 'x86_64'
-    exclude:
-      # os added in 22.10
-      - stream: '2206'
-        os: 'ubuntu2204'
 # [end] VPP-X86_64 PROJECT
 
 # VPP-DEBUG-X86_64 PROJECT
@@ -175,9 +161,6 @@
       - 'master':
           branch: 'master'
           branch-refspec: ''
-      - '2206':
-          branch: 'stable/2206'
-          branch-refspec: ''
       - '2210':
           branch: 'stable/2210'
           branch-refspec: ''
@@ -194,9 +177,6 @@
       # os deprecated in master
       - stream: 'master'
         os: 'ubuntu2004'
-      # os added in 22.10
-      - stream: '2206'
-        os: 'ubuntu2204'
 # [end] VPP-GCC-X86_64 PROJECT
 
 # VPP-AARCH64 PROJECT
@@ -221,11 +201,6 @@
           branch-refspec: ''
           make-test-os: 'ubuntu-20.04 ubuntu-22.04'
           make-test-multiworker-os: ''
-      - '2206':
-          branch: 'stable/2206'
-          branch-refspec: ''
-          make-test-os: 'ubuntu-20.04'
-          make-test-multiworker-os: ''
       - '2210':
           branch: 'stable/2210'
           branch-refspec: ''
@@ -240,10 +215,6 @@
       - ubuntu2004
       - ubuntu2204
     executor-arch: 'aarch64'
-    exclude:
-      # os added in 22.10
-      - stream: '2206'
-        os: 'ubuntu2204'
 # [end] VPP-AARCH64 PROJECT
 
 # VPP-CSIT-VERIFY-DEVICE PROJECT