X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Ftox-run.sh;h=3f1f92a9ac60aac2813da9f9d1d123810a473fde;hb=2a10c83b2d506008cc6c01c134515fb6328e1f3a;hp=dd6769996a0299621d122bc95d740af76c9252ba;hpb=7030e31159d6ee4fbab8ae015611a39cbcd62e2c;p=releng%2Fglobal-jjb.git

diff --git a/shell/tox-run.sh b/shell/tox-run.sh
index dd676999..3f1f92a9 100644
--- a/shell/tox-run.sh
+++ b/shell/tox-run.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
 # Copyright (c) 2017 The Linux Foundation and others.
@@ -10,9 +10,6 @@
 ##############################################################################
 echo "---> tox-run.sh"
 
-# shellcheck source=/tmp/v/tox/bin/activate disable=SC1091
-source "/tmp/v/tox/bin/activate"
-
 # 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
@@ -27,16 +24,40 @@ if [ -d "/opt/pyenv" ]; then
     export PATH="$PYENV_ROOT/bin:$PATH"
 fi
 
-if [ ! -z "$TOX_ENVS" ]; then
-    detox -e "$TOX_ENVS"  | tee -a "$ARCHIVE_TOX_DIR/detox.log"
+# 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"
+        tox_status="${PIPESTATUS[0]}"
+    else
+        detox | tee -a "$ARCHIVE_TOX_DIR/detox.log"
+        tox_status="${PIPESTATUS[0]}"
+    fi
 else
-    detox | tee -a "$ARCHIVE_TOX_DIR/detox.log"
+    if [ ! -z "$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
 
 # Disable SC2116 as we want to echo a space separated list of TOX_ENVS
 # shellcheck disable=SC2116
-for i in $(echo "${TOX_ENVS//,/ }"); do
-    cp -r ".tox/$i/log" "$ARCHIVE_TOX_DIR/$i"
+for i in .tox/*/log; do
+    tox_env=$(echo $i | awk -F'/' '{print $2}')
+    cp -r "$i" "$ARCHIVE_TOX_DIR/$tox_env"
 done
+set -e  # Logs collected so re-enable
 
 echo "Completed tox runs."
+
+test "$tox_status" -eq 0 || exit "$tox_status"