summaryrefslogtreecommitdiffstats
path: root/docker/scripts/lib_csit.sh
diff options
context:
space:
mode:
authorDave Wallace <dwallacelf@gmail.com>2021-01-04 16:46:24 -0500
committerDave Wallace <dwallacelf@gmail.com>2021-01-05 13:51:15 -0500
commit64efa7313f9146a6176a4637967fd4c04dc693df (patch)
tree587fadf891694705f61e86c158ebfe146c5b9640 /docker/scripts/lib_csit.sh
parent6fd3831a27b4d188de48bb988a699a6ee507dcd6 (diff)
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
Diffstat (limited to 'docker/scripts/lib_csit.sh')
-rw-r--r--docker/scripts/lib_csit.sh10
1 files changed, 2 insertions, 8 deletions
diff --git a/docker/scripts/lib_csit.sh b/docker/scripts/lib_csit.sh
index 9958faba2..a903ab0d8 100644
--- 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!"