Remove stable/2101 branches from docker executor builder

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

diff --git a/docker/scripts/dbld_lfit_requirements.sh b/docker/scripts/dbld_lfit_requirements.sh
index 7067d99..b60e24d 100755 (executable)
--- a/docker/scripts/dbld_lfit_requirements.sh
+++ b/docker/scripts/dbld_lfit_requirements.sh
@@ -53,6 +53,6 @@ mkdir -p "$LF_VENV"
 OLD_PATH="$PATH"
 python3 -m venv "$LF_VENV"
 PATH="$LF_VENV/bin:$PATH"
-python3 -m pip install --upgrade pip
+python3 -m pip install --upgrade pip==21.2.4
 python3 -m pip install --upgrade --upgrade-strategy eager lftools
 PATH="$OLD_PATH"

diff --git a/docker/scripts/dbld_vpp_install_packages.sh b/docker/scripts/dbld_vpp_install_packages.sh
index aa34c1b..d6e5262 100755 (executable)
--- a/docker/scripts/dbld_vpp_install_packages.sh
+++ b/docker/scripts/dbld_vpp_install_packages.sh
@@ -71,12 +71,16 @@ for branch in ${VPP_BRANCHES[$OS_NAME]} ; do
         exit 1
     fi
     # Install/cache python packages
+    make_vpp_test "test-dep" "$branch"
     if [ "$OS_ID" = "ubuntu" ] ; then
-        make_vpp_test "test-dep" "$branch"
+         # TODO: Remove make test-doc after VPP 21.06 and 21.10 are no longer supported
+        #       which is deprecated in master (VPP 22.02)
         make_vpp_test "doc" "$branch"
         make_vpp test-wipe "$branch"
-        make_vpp "bootstrap-doxygen" "$branch"
     fi
+    # Clean up virtual environment
+    git checkout -q -- .
+    git clean -qfdx
 
     # Dump packages installed
     case "$DOCKERFILE_FROM" in

diff --git a/docker/scripts/lib_vpp.sh b/docker/scripts/lib_vpp.sh
index 4e7a480..491b75f 100644 (file)
--- a/docker/scripts/lib_vpp.sh
+++ b/docker/scripts/lib_vpp.sh
@@ -99,8 +99,8 @@ docker_build_setup_vpp() {
 #       to create an enumerated set of jobs jobs that match the
 #       definitions here.
 declare -A VPP_BRANCHES
-VPP_BRANCHES["centos-8"]="stable/2101 stable/2106 stable/2110 master"
-VPP_BRANCHES["debian-10"]="stable/2101 stable/2106 stable/2110 master"
-VPP_BRANCHES["ubuntu-18.04"]="stable/2101 stable/2106 stable/2110 master"
-VPP_BRANCHES["ubuntu-20.04"]="stable/2101 stable/2106 stable/2110 master"
+VPP_BRANCHES["centos-8"]="stable/2106 stable/2110 master"
+VPP_BRANCHES["debian-10"]="stable/2106 stable/2110 master"
+VPP_BRANCHES["ubuntu-18.04"]="stable/2106 stable/2110 master"
+VPP_BRANCHES["ubuntu-20.04"]="stable/2106 stable/2110 master"
 export VPP_BRANCHES