X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Ftox-run.sh;h=4321ea68ba47760cb2ca104944d7bc8e8e1bf06c;hb=eafdcafcbe25dbad05e5117aca20bf6ea048ac44;hp=91e040ada37380420b2d9d4cd8a31b1f25ddf552;hpb=c80aa5b36c3a2d08dc47d9c5d1cc2366cd161863;p=releng%2Fglobal-jjb.git

diff --git a/shell/tox-run.sh b/shell/tox-run.sh
index 91e040ad..4321ea68 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,24 +30,31 @@ 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
-        tox -e "$TOX_ENVS" --parallel auto --parallel-live | tee -a "$ARCHIVE_TOX_DIR/tox.log"
-        tox_status="${PIPESTATUS[0]}"
-    else
-        tox --parallel auto --parallel-live | tee -a "$ARCHIVE_TOX_DIR/tox.log"
-        tox_status="${PIPESTATUS[0]}"
-    fi
-else
-    if [[ -n ${TOX_ENVS:-} ]]; then
-        tox -e "$TOX_ENVS" | tee -a "$ARCHIVE_TOX_DIR/tox.log"
-        tox_status="${PIPESTATUS[0]}"
-    else
-        tox | tee -a "$ARCHIVE_TOX_DIR/tox.log"
-        tox_status="${PIPESTATUS[0]}"
-    fi
-fi
+TOX_OPTIONS_LIST=""
+
+if [[ -n ${TOX_ENVS:-} ]]; then
+    TOX_OPTIONS_LIST=$TOX_OPTIONS_LIST" -e $TOX_ENVS"
+fi;
+
+case ${PARALLEL,,} in
+    true|auto )
+        TOX_OPTIONS_LIST=$TOX_OPTIONS_LIST" --parallel auto --parallel-live";;
+    all )
+        TOX_OPTIONS_LIST=$TOX_OPTIONS_LIST" --parallel all --parallel-live";;
+    [0-9]* )
+        TOX_OPTIONS_LIST=$TOX_OPTIONS_LIST" --parallel ${PARALLEL} --parallel-live";;
+esac
+
+
+# $TOX_OPTIONS_LIST are intentionnaly not surrounded by quotes
+# to correcly pass options to tox
+# shellcheck disable=SC2086
+tox $TOX_OPTIONS_LIST | tee -a "$ARCHIVE_TOX_DIR/tox.log"
+tox_status="${PIPESTATUS[0]}"
 
 echo "---> Completed tox runs"