X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Ftox-install.sh;h=56bc43a946f74739affe4a46524afa8ea6ff0fdd;hb=d1e8579fac0f3a0aeba74f70b27a06ab3fdad54f;hp=4708e88c374f33053fa4cf609fde848e04f87d39;hpb=1873622e1b5bf98150db6850901d190dd6c35422;p=releng%2Fglobal-jjb.git

diff --git a/shell/tox-install.sh b/shell/tox-install.sh
index 4708e88c..56bc43a9 100644
--- a/shell/tox-install.sh
+++ b/shell/tox-install.sh
@@ -10,12 +10,16 @@
 ##############################################################################
 echo "---> tox-install.sh"
 
-# Ensure we fail the job if any steps fail.
-# DO NOT set -u as virtualenv's activate script has unbound variables
-set -e -o pipefail
+# Ensure we fail the job if any steps fail or variables are missing.
+# Use -x to show value of $PYTHON in output
+set -eux -o pipefail
 
-# Tox version is pulled in through detox to mitigate version conflict
-python -m pip install --user --quiet --upgrade tox-pyenv
+# shellcheck disable=SC1090
+source ~/lf-env.sh
 
-echo "----> pip freeze"
-pip freeze
+lf-activate-venv --venv-file /tmp/.toxenv tox virtualenv urllib3~=1.26.15
+
+# installs are silent, show version details in log
+$PYTHON --version
+$PYTHON -m pip --version
+$PYTHON -m pip freeze