X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Ftox-install.sh;h=0434b3a2b19f533e4faabba855ca7a280348c424;hb=b9eb4581940562effcf67863704a3ec2c47ceca0;hp=96c0fa38055f08e6f56551e76a969262893ba18b;hpb=ad0ee7c792b24345f2b419b3418bd84eac0f6ac1;p=releng%2Fglobal-jjb.git

diff --git a/shell/tox-install.sh b/shell/tox-install.sh
index 96c0fa38..0434b3a2 100644
--- a/shell/tox-install.sh
+++ b/shell/tox-install.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
 # Copyright (c) 2017 The Linux Foundation and others.
@@ -10,16 +10,29 @@
 ##############################################################################
 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
 
-virtualenv --quiet -p "$PYTHON_VERSION" "/tmp/v/tox"
-# shellcheck source=/tmp/v/tox/bin/activate disable=SC1091
-source "/tmp/v/tox/bin/activate"
-pip install --quiet --upgrade "pip==9.0.3" setuptools
-pip install --quiet --upgrade pipdeptree
-pip install --quiet --upgrade argparse detox "tox<3.0.0" tox-pyenv
+#Python 3.5 and python2 tox in Ubuntu 16.04 workaround
+done="False"
+if [[ -f /etc/lsb-release ]]; then
+   # shellcheck disable=SC1091
+   source /etc/lsb-release
+   if [[ $DISTRIB_RELEASE == "16.04" ]]; then
+       echo "WARNING: Python projects should move to Ubuntu 18.04 to continue receiving support"
+       python2 -m pip install --user --quiet --upgrade tox tox-pyenv virtualenv more-itertools~=5.0.0
+       python3 -m pip install --user --quiet --upgrade tox tox-pyenv virtualenv zipp==1.1.0
+       done="True"
+   fi
+fi
 
-echo "----> Pip Dependency Tree"
-pipdeptree
+if [[ $done != "True" ]]; then
+        python -m pip install --user --quiet --upgrade tox tox-pyenv virtualenv more-itertools~=5.0.0
+        python3 -m pip install --user --quiet --upgrade tox tox-pyenv virtualenv
+fi
+
+# installs are silent, show version details in log
+$PYTHON --version
+$PYTHON -m pip --version
+$PYTHON -m pip freeze