X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Ftox-install.sh;h=5e527b3f1c62efab8a64d25b8e5c58802f104f7a;hb=ec41105d19ed820573be66cde4e2b621fc63aeed;hp=ad9833626608351ab1d4f9a9e33a932a0284b735;hpb=59fddb14b61b70dcdc2abde099c8a8c8f313d891;p=releng%2Fglobal-jjb.git

diff --git a/shell/tox-install.sh b/shell/tox-install.sh
index ad983362..5e527b3f 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 argparse detox tox-pyenv
+# shellcheck disable=SC1090
+source ~/lf-env.sh
 
-echo "----> pip freeze"
-pip freeze
+lf-activate-venv --python python3.8 --venv-file /tmp/.toxenv tox tox-pyenv virtualenv
+
+# installs are silent, show version details in log
+$PYTHON --version
+$PYTHON -m pip --version
+$PYTHON -m pip freeze