Remove vpp stable/2106 jenkins jobs.

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

diff --git a/docker/scripts/lib_vpp.sh b/docker/scripts/lib_vpp.sh
index 6b36338..71cb5fb 100644 (file)
--- a/docker/scripts/lib_vpp.sh
+++ b/docker/scripts/lib_vpp.sh
@@ -99,7 +99,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-10"]="stable/2106 stable/2110 stable/2202 master"
-VPP_BRANCHES["ubuntu-18.04"]="stable/2106 stable/2110"
-VPP_BRANCHES["ubuntu-20.04"]="stable/2106 stable/2110 stable/2202 master"
+VPP_BRANCHES["debian-10"]="stable/2110 stable/2202 master"
+VPP_BRANCHES["ubuntu-18.04"]="stable/2110"
+VPP_BRANCHES["ubuntu-20.04"]="stable/2110 stable/2202 master"
 export VPP_BRANCHES

diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml
index e4e3c01..39e470d 100644 (file)
--- a/jjb/vpp/docs.yaml
+++ b/jjb/vpp/docs.yaml
@@ -13,9 +13,6 @@
       - master:
           branch: 'master'
           branch-refspec: ''
-      - '2106':
-          branch: 'stable/2106'
-          branch-refspec: ''
       - '2110':
           branch: 'stable/2110'
           branch-refspec: ''
@@ -23,7 +20,7 @@
           branch: 'stable/2202'
           branch-refspec: ''
 
-# TODO: Remove when stable/2106 and stable/2110 are no longer supported.
+# TODO: Remove when stable/2110 is no longer supported.
 - project:
     name: make-test-docs
     jobs:
@@ -35,9 +32,6 @@
     os: 'ubuntu2004'
 
     stream:
-      - '2106':
-          branch: 'stable/2106'
-          branch-refspec: ''
       - '2110':
           branch: 'stable/2110'
           branch-refspec: ''

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 4f6bfcb..059d1e3 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -38,9 +38,6 @@
       - master:
           branch: 'master'
           branch-refspec: ''
-      - '2106':
-          branch: 'stable/2106'
-          branch-refspec: ''
       - '2110':
           branch: 'stable/2110'
           branch-refspec: ''
@@ -71,9 +68,6 @@
       - master:
           branch: 'master'
           branch-refspec: ''
-      - '2106':
-          branch: 'stable/2106'
-          branch-refspec: ''
       - '2110':
           branch: 'stable/2110'
           branch-refspec: ''
@@ -81,23 +75,15 @@
           branch: 'stable/2202'
           branch-refspec: ''
     os:
-      - centos8
       - debian10
       - ubuntu1804
       - ubuntu2004
     executor-arch: 'x86_64'
     exclude:
       # OS deprecated in master
-      - stream: 'master'
-        os: 'centos8'
       - stream: 'master'
         os: 'ubuntu1804'
-      # OS deprecated on 2110
-      - stream: '2110'
-        os: 'centos8'
       # OS deprecated on 2202
-      - stream: '2202'
-        os: 'centos8'
       - stream: '2202'
         os: 'ubuntu1804'
 # [end] VPP-X86_64 PROJECT
@@ -138,9 +124,6 @@
       - master:
           branch: 'master'
           branch-refspec: ''
-      - '2106':
-          branch: 'stable/2106'
-          branch-refspec: ''
       - '2110':
           branch: 'stable/2110'
           branch-refspec: ''
@@ -170,9 +153,6 @@
       - master:
           branch: 'master'
           branch-refspec: ''
-      - '2106':
-          branch: 'stable/2106'
-          branch-refspec: ''
       - '2110':
           branch: 'stable/2110'
           branch-refspec: ''
@@ -180,22 +160,14 @@
           branch: 'stable/2202'
           branch-refspec: ''
     os:
-      - centos8
       - ubuntu1804
       - ubuntu2004
     executor-arch: 'aarch64'
     exclude:
       # OS deprecated in master
-      - stream: 'master'
-        os: 'centos8'
       - stream: 'master'
         os: 'ubuntu1804'
-      # OS deprecated in 2110
-      - stream: '2110'
-        os: 'centos8'
       # OS deprecated in 2202
-      - stream: '2202'
-        os: 'centos8'
       - stream: '2202'
         os: 'ubuntu1804'
 # [end] VPP-AARCH64 PROJECT