X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;ds=sidebyside;f=shell%2Ftox-run.sh;fp=shell%2Ftox-run.sh;h=68a5af9420f2c13d898b44876bd0ed719fad6cf8;hb=43e8d01716072314eb7d90cb1da1db4b431bb6cd;hp=91e040ada37380420b2d9d4cd8a31b1f25ddf552;hpb=86f276e966e01b037d96a1a87cb6ad1fce18f7cc;p=releng%2Fglobal-jjb.git

diff --git a/shell/tox-run.sh b/shell/tox-run.sh
index 91e040ad..68a5af94 100644
--- a/shell/tox-run.sh
+++ b/shell/tox-run.sh
@@ -13,6 +13,9 @@ echo "---> tox-run.sh"
 # do not use -o pipefail
 set -eux
 
+#Ensure that tox from tox-install.sh takes precedence.
+PATH=$HOME/.local/bin:$PATH
+
 ARCHIVE_TOX_DIR="$WORKSPACE/archives/tox"
 ARCHIVE_DOC_DIR="$WORKSPACE/archives/docs"
 mkdir -p "$ARCHIVE_TOX_DIR"
@@ -27,6 +30,9 @@ if [[ -d /opt/pyenv ]]; then
     export TOX_TESTENV_PASSENV=PYTHONPATH
 fi
 
+#Useful debug
+tox --version
+
 PARALLEL="${PARALLEL:-true}"
 if [[ ${PARALLEL,,} = true ]]; then
     if [[ -n ${TOX_ENVS:-} ]]; then