X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Ftox-install.sh;h=f8472cc9287ad5b5f8d3c922dc4802569ba7c74a;hb=0ad9506f94f815ebdfa84f7b5ecd8b97cc0ba531;hp=09b9ab271bfe9ba3577955a01ac18e06d96ab2e8;hpb=52980f24cf898a614c39d3a3c6674ccd4622aee0;p=releng%2Fglobal-jjb.git

diff --git a/shell/tox-install.sh b/shell/tox-install.sh
index 09b9ab27..f8472cc9 100644
--- a/shell/tox-install.sh
+++ b/shell/tox-install.sh
@@ -1,17 +1,27 @@
-#!/bin/bash
+#!/bin/bash -l
+# SPDX-License-Identifier: EPL-1.0
+##############################################################################
+# Copyright (c) 2017 The Linux Foundation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+##############################################################################
 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 "$WORKSPACE/.virtualenvs/tox"
-# shellcheck source=./.virtualenvs/tox/bin/activate disable=SC1091
-source "$WORKSPACE/.virtualenvs/tox/bin/activate"
-PYTHON="$WORKSPACE/.virtualenvs/tox/bin/python"
-$PYTHON -m pip install --quiet --upgrade pip
-$PYTHON -m pip install --quiet --upgrade pipdeptree
-$PYTHON -m pip install --quiet --upgrade tox argparse
+# Tox version is pulled in through detox to mitigate version conflict
 
-echo "----> Pip Dependency Tree"
-pipdeptree
+
+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