Remove VPP 19.08 jobs

- Also remove stable/1908 from the docker image build scripts.

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

diff --git a/docker/scripts/lib_csit.sh b/docker/scripts/lib_csit.sh
index 9958fab..a903ab0 100644 (file)
--- a/docker/scripts/lib_csit.sh
+++ b/docker/scripts/lib_csit.sh
@@ -147,14 +147,8 @@ csit_pip_cache() {
 
         # Virtualenv version is pinned in common.sh in newer csit branches.
         # (note: xargs removes leading/trailing spaces)
-        #
-        # TODO: pip3 install virtualenv==20.0.20 installs a version of virtualenv
-        #       which hardcodes python3 in the shebang line.  This breaks branches
-        #       containing python2 code (eg. oper1908-*).
-        #       Restore when 19.08 is no longer supported or is updated to override
-        #       the shebang in virtualenv (e.g. 'python2.7 virtualenv env')
-        # install_virtualenv="$(grep 'virtualenv' $csit_bash_function_dir/common.sh | grep pip | grep install | cut -d'|' -f1 | xargs)"
-        # $install_virtualenv
+        install_virtualenv="$(grep 'virtualenv' $csit_bash_function_dir/common.sh | grep pip | grep install | cut -d'|' -f1 | xargs)"
+        $install_virtualenv
 
         git checkout -q -- .
         echo_log "    Completed $description!"

diff --git a/docker/scripts/lib_vpp.sh b/docker/scripts/lib_vpp.sh
index 72bec64..74655ff 100644 (file)
--- a/docker/scripts/lib_vpp.sh
+++ b/docker/scripts/lib_vpp.sh
@@ -81,10 +81,10 @@ docker_build_setup_vpp() {
 # Branches must be listed in chronological order -- oldest stable branch
 # first and master last.
 declare -A VPP_BRANCHES
-VPP_BRANCHES["centos-7"]="stable/1908 stable/2001 stable/2005 stable/2009"
+VPP_BRANCHES["centos-7"]="stable/2001 stable/2005 stable/2009"
 VPP_BRANCHES["centos-8"]="stable/2009 master"
 VPP_BRANCHES["debian-9"]="stable/2009 master"
 VPP_BRANCHES["debian-10"]="stable/2009 master"
-VPP_BRANCHES["ubuntu-18.04"]="stable/1908 stable/2001 stable/2005 stable/2009 master"
+VPP_BRANCHES["ubuntu-18.04"]="stable/2001 stable/2005 stable/2009 master"
 VPP_BRANCHES["ubuntu-20.04"]="stable/2009 master"
 export VPP_BRANCHES

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

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index b0e2283..07a3332 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -41,10 +41,6 @@
           branch: 'master'
           repo-stream-part: 'master'
           branch-head-refspec: ''
-      - '1908':
-          branch: 'stable/1908'
-          repo-stream-part: 'stable.1908'
-          branch-head-refspec: ''
       - '2005':
           branch: 'stable/2005'
           repo-stream-part: 'stable.2005'
@@ -75,10 +71,6 @@
           branch: 'master'
           repo-stream-part: 'master'
           branch-head-refspec: ''
-      - '1908':
-          branch: 'stable/1908'
-          repo-stream-part: 'stable.1908'
-          branch-head-refspec: ''
       - '2005':
           branch: 'stable/2005'
           repo-stream-part: 'stable.2005'
@@ -107,10 +99,6 @@
     make-parallel-jobs: '4'
     archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
     stream:
-      - '1908':
-          branch: 'stable/1908'
-          repo-stream-part: 'stable.1908'
-          branch-head-refspec: ''
       - '2005':
           branch: 'stable/2005'
           repo-stream-part: 'stable.2005'
@@ -275,10 +263,6 @@
           branch: 'master'
           repo-stream-part: 'master'
           branch-head-refspec: ''
-      - '1908':
-          branch: 'stable/1908'
-          repo-stream-part: 'stable.1908'
-          branch-head-refspec: ''
       - '2005':
           branch: 'stable/2005'
           repo-stream-part: 'stable.2005'
@@ -388,9 +372,6 @@
       - master:
           branch: 'master'
           repo-stream-part: 'master'
-      - '1908':
-          branch: 'stable/1908'
-          repo-stream-part: 'stable.1908'
       - '2005':
           branch: 'stable/2005'
           repo-stream-part: 'stable.2005'
@@ -420,8 +401,6 @@
           executor: 'ubuntu1804arm-s'
           make-parallel-jobs: '16'
     exclude:
-      - stream: '1908'
-        device-node-arch: '1n-tx2'
       - stream: '2001'
         device-node-arch: '1n-tx2'
       - stream: '2005'
@@ -441,9 +420,6 @@
     executor: 'vpp-csit-device'
     skip-vote: 'false'
     stream:
-      - '1908':
-          branch: 'stable/1908'
-          repo-stream-part: 'stable.1908'
       - '2009':
           branch: 'stable/2009'
           repo-stream-part: 'stable.2009'
@@ -1236,8 +1212,6 @@
           build-timeout: 300
 
     triggers:
-      # TODO: Make other verify jobs trigger on success of this one,
-      # without breaking verification for VPP branches before stable/1908.
       - gerrit-trigger-checkstyle:
           name: '{project}'
           branch: '{branch}'