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

diff --git a/shell/tox-run.sh b/shell/tox-run.sh
index 47380010..91e040ad 100644
--- a/shell/tox-run.sh
+++ b/shell/tox-run.sh
@@ -10,34 +10,35 @@
 ##############################################################################
 echo "---> tox-run.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
+# do not use -o pipefail
+set -eux
 
 ARCHIVE_TOX_DIR="$WORKSPACE/archives/tox"
+ARCHIVE_DOC_DIR="$WORKSPACE/archives/docs"
 mkdir -p "$ARCHIVE_TOX_DIR"
-cd "$WORKSPACE/$TOX_DIR"
+cd "$WORKSPACE/$TOX_DIR" || exit 1
 
-if [ -d "/opt/pyenv" ]; then
+if [[ -d /opt/pyenv ]]; then
     echo "---> Setting up pyenv"
     export PYENV_ROOT="/opt/pyenv"
     export PATH="$PYENV_ROOT/bin:$PATH"
+    PYTHONPATH="$(pwd)"
+    export PYTHONPATH
+    export TOX_TESTENV_PASSENV=PYTHONPATH
 fi
 
-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 [[ ${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
-        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"
@@ -45,14 +46,26 @@ else
     fi
 fi
 
+echo "---> Completed tox runs"
+
 # 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}')
-    cp -r "$i" "$ARCHIVE_TOX_DIR/$tox_env"
+    tox_env=$(echo "$i" | awk -F'/' '{print $2}')
+    # defend against glob finding no matches
+    if ! cp -r "$i" "$ARCHIVE_TOX_DIR/$tox_env"; then
+        echo "WARN: no logs found to archive"
+        break
+    fi
 done
-set -e  # Logs collected so re-enable
 
-echo "Completed tox runs."
+# If docs are generated push them to archives.
+DOC_DIR="${DOC_DIR:-docs/_build/html}"
+if [[ -d $DOC_DIR ]]; then
+    echo "---> Archiving generated docs"
+    mv "$DOC_DIR" "$ARCHIVE_DOC_DIR"
+fi
+
+echo "---> tox-run.sh ends"
 
 test "$tox_status" -eq 0 || exit "$tox_status"