X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Ftox-run.sh;h=c15989175cf17184b3f48d140ded736f0709462e;hb=e50da79e348b4302edf4f2cc2ed4842830f9cc54;hp=47380010fbd0386eb8f2b784f113b1e93553d90b;hpb=066055a8b0c03ba248cc8806ac8f0e3d1a08828a;p=releng%2Fglobal-jjb.git

diff --git a/shell/tox-run.sh b/shell/tox-run.sh
index 47380010..c1598917 100644
--- a/shell/tox-run.sh
+++ b/shell/tox-run.sh
@@ -24,20 +24,25 @@ if [ -d "/opt/pyenv" ]; then
     export PATH="$PYENV_ROOT/bin:$PATH"
 fi
 
+# Set and pass in PYTHONPATH to circumvent installation bug in tox>=3.2.0
+PYTHONPATH=$(pwd)
+export PYTHONPATH
+export TOX_TESTENV_PASSENV=PYTHONPATH
+
 set +e  # Allow detox to fail so that we can collect the logs in the next step
 
 PARALLEL="${PARALLEL:-true}"
 if [ "${PARALLEL}" = true ]; then
-    if [ ! -z "$TOX_ENVS" ]; then
-        detox -e "$TOX_ENVS"  | tee -a "$ARCHIVE_TOX_DIR/detox.log"
+    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
-        detox | tee -a "$ARCHIVE_TOX_DIR/detox.log"
+        tox --parallel auto --parallel-live | tee -a "$ARCHIVE_TOX_DIR/tox.log"
         tox_status="${PIPESTATUS[0]}"
     fi
 else
-    if [ ! -z "$TOX_ENVS" ]; then
-        tox -e "$TOX_ENVS"  | tee -a "$ARCHIVE_TOX_DIR/tox.log"
+    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"
@@ -48,7 +53,7 @@ fi
 # Disable SC2116 as we want to echo a space separated list of TOX_ENVS
 # shellcheck disable=SC2116
 for i in .tox/*/log; do
-    tox_env=$(echo $i | awk -F'/' '{print $2}')
+    tox_env=$(echo "$i" | awk -F'/' '{print $2}')
     cp -r "$i" "$ARCHIVE_TOX_DIR/$tox_env"
 done
 set -e  # Logs collected so re-enable