Fix OS_CLOUD export for image validation

[releng/global-jjb.git] / shell / tox-install.sh

diff --git a/shell/tox-install.sh b/shell/tox-install.sh
index 3aceceb..f8472cc 100644 (file)
--- a/shell/tox-install.sh
+++ b/shell/tox-install.sh
@@ -10,11 +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
 
-python -m pip install --user --quiet --upgrade argparse detox "tox<3.0.0" tox-pyenv
+# Tox version is pulled in through detox to mitigate version conflict
 
-echo "----> pip freeze"
-pip freeze
+
+if [[ $PYTHON == "python2" ]]; then
+    $PYTHON -m pip install --user --quiet --upgrade tox tox-pyenv virtualenv more-itertools~=5.0.0
+else
+    $PYTHON -m pip install --user --quiet --upgrade tox tox-pyenv virtualenv
+fi
+
+
+$PYTHON -m pip freeze