Deprecate VPP stable/2005

Signed-off-by: Dave Wallace <[email protected]>
Change-Id: Ifba4ab4270d8eddf9713fa817f00b179247fd09f

diff --git a/docker/scripts/lib_vpp.sh b/docker/scripts/lib_vpp.sh
index 2842061..5ed538a 100644 (file)
--- a/docker/scripts/lib_vpp.sh
+++ b/docker/scripts/lib_vpp.sh
@@ -88,10 +88,10 @@ docker_build_setup_vpp() {
 #       to create an enumerated set of jobs jobs that match the
 #       definitions here.
 declare -A VPP_BRANCHES
-VPP_BRANCHES["centos-7"]="stable/2005 stable/2009"
+VPP_BRANCHES["centos-7"]="stable/2009"
 VPP_BRANCHES["centos-8"]="stable/2009 stable/2101 master"
 VPP_BRANCHES["debian-9"]="stable/2009"
 VPP_BRANCHES["debian-10"]="stable/2009 stable/2101 master"
-VPP_BRANCHES["ubuntu-18.04"]="stable/2005 stable/2009 stable/2101 master"
+VPP_BRANCHES["ubuntu-18.04"]="stable/2009 stable/2101 master"
 VPP_BRANCHES["ubuntu-20.04"]="stable/2009 stable/2101 master"
 export VPP_BRANCHES

diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml
index 61273dc..6965995 100644 (file)
--- a/jjb/vpp/docs.yaml
+++ b/jjb/vpp/docs.yaml
@@ -14,8 +14,6 @@
     stream:
       - master:
           branch: 'master'
-      - '2005':
-          branch: 'stable/2005'
       - '2009':
           branch: 'stable/2009'
       - '2101':

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 9854b76..0633041 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -42,11 +42,6 @@
           os: 'ubuntu2004'
           repo-stream-part: 'master'
           branch-head-refspec: ''
-      - '2005':
-          branch: 'stable/2005'
-          os: 'ubuntu1804'
-          repo-stream-part: 'stable.2005'
-          branch-head-refspec: ''
       - '2009':
           branch: 'stable/2009'
           os: 'ubuntu1804'
@@ -75,10 +70,6 @@
           branch: 'master'
           repo-stream-part: 'master'
           branch-head-refspec: ''
-      - '2005':
-          branch: 'stable/2005'
-          repo-stream-part: 'stable.2005'
-          branch-head-refspec: ''
       - '2009':
           branch: 'stable/2009'
           repo-stream-part: 'stable.2009'
@@ -103,10 +94,6 @@
     make-parallel-jobs: '4'
     archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
     stream:
-      - '2005':
-          branch: 'stable/2005'
-          repo-stream-part: 'stable.2005'
-          branch-head-refspec: ''
       - '2009':
           branch: 'stable/2009'
           repo-stream-part: 'stable.2009'
@@ -117,9 +104,6 @@
       - debian9:
           repo-os-part: 'stretch'
     executor-arch: 'x86_64'
-    exclude:
-      - stream: '2005'
-        os: 'debian9'
 # [end] VPP-OS-EOL-X86_64 PROJECT
 
 # VPP-OS-IN-2009-X86_64 PROJECT
@@ -269,10 +253,6 @@
           branch: 'master'
           repo-stream-part: 'master'
           branch-head-refspec: ''
-      - '2005':
-          branch: 'stable/2005'
-          repo-stream-part: 'stable.2005'
-          branch-head-refspec: ''
       - '2009':
           branch: 'stable/2009'
           repo-stream-part: 'stable.2009'
@@ -378,9 +358,6 @@
       - master:
           branch: 'master'
           repo-stream-part: 'master'
-      - '2005':
-          branch: 'stable/2005'
-          repo-stream-part: 'stable.2005'
       - '2009':
           branch: 'stable/2009'
           repo-stream-part: 'stable.2009'
@@ -409,8 +386,6 @@
     exclude:
       - stream: '2001'
         device-node-arch: '1n-tx2'
-      - stream: '2005'
-        device-node-arch: '1n-tx2'
 
 # [end] VPP-CSIT-PERPATCH PROJECT