X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Ftox-install.sh;h=78716b0594741103bcd9b0b4cc6ff252b2979b39;hb=a86978478e005c9ab1ad7fbf24712288f7e6db65;hp=cc815ccda79819ec0d0216331914e396308bf580;hpb=8285615e111cae15f76eba24e5720068d16e778f;p=releng%2Fglobal-jjb.git

diff --git a/shell/tox-install.sh b/shell/tox-install.sh
index cc815ccd..78716b05 100644
--- a/shell/tox-install.sh
+++ b/shell/tox-install.sh
@@ -14,12 +14,22 @@ echo "---> tox-install.sh"
 # 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 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
 
-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
+if [[ $done != "True" ]]; then
+        python -m pip install --user --quiet --upgrade tox tox-pyenv virtualenv zipp 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