diff options
| author |   Peter Mikus <pmikus@cisco.com> | 2021-11-16 06:59:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2021-11-16 06:59:36 +0000 |
| commit | 60ec179c18d8b09d8a2ee3b5f763581613e52a68 (patch) | |
| tree | e0f12d93b32edb869d4baf32773ce81589ace323 | |
| parent | 6a508a4a67b4bda6011340396a64415a20b759fe (diff) | |
| parent | c04bcf618cb88ac3c829be3f584ec411a8abf01a (diff) | |
Merge "Remove stable/2101 branches from docker executor builder"
| -rwxr-xr-x | docker/scripts/dbld_lfit_requirements.sh | 2 | ||||
| -rwxr-xr-x | docker/scripts/dbld_vpp_install_packages.sh | 8 | ||||
| -rw-r--r-- | docker/scripts/lib_vpp.sh | 8 |
3 files changed, 11 insertions, 7 deletions
diff --git a/docker/scripts/dbld_lfit_requirements.sh b/docker/scripts/dbld_lfit_requirements.sh index 7067d9929..b60e24dfd 100755 --- 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 aa34c1b11..d6e526298 100755 --- 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 4e7a480a5..491b75f57 100644 --- 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 |