X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Ftox-install.sh;h=83097f9842a1fb4d71bf46e46fb0c8e9565f0984;hb=refs%2Fchanges%2F89%2F62089%2F1;hp=ad9833626608351ab1d4f9a9e33a932a0284b735;hpb=59fddb14b61b70dcdc2abde099c8a8c8f313d891;p=releng%2Fglobal-jjb.git

diff --git a/shell/tox-install.sh b/shell/tox-install.sh
index ad983362..83097f98 100644
--- a/shell/tox-install.sh
+++ b/shell/tox-install.sh
@@ -10,12 +10,18 @@
 ##############################################################################
 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
 
-echo "----> pip freeze"
-pip freeze
+
+if [[ $PYTHON == "python2" ]]; then
+    $PYTHON -m pip install --user --quiet --upgrade tox tox-pyenv more-itertools~=5.0.0
+else
+    $PYTHON -m pip install --user --quiet --upgrade tox tox-pyenv
+fi
+
+
+$PYTHON -m pip freeze