X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Ftox-run.sh;h=68a5af9420f2c13d898b44876bd0ed719fad6cf8;hb=c8b9acd166fcbd88139a65f7721e522980a0e013;hp=c955466c385a54ab6d98eb25cb32f31ded5075c8;hpb=3ca80e4b7818ebe309abc3ddcabe7086f1ed2d18;p=releng%2Fglobal-jjb.git

diff --git a/shell/tox-run.sh b/shell/tox-run.sh
index c955466c..68a5af94 100644
--- a/shell/tox-run.sh
+++ b/shell/tox-run.sh
@@ -10,12 +10,18 @@
 ##############################################################################
 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"
 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"
@@ -24,9 +30,12 @@ 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
+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
@@ -34,7 +43,7 @@ if [ "${PARALLEL}" = true ]; then
         tox_status="${PIPESTATUS[0]}"
     fi
 else
-    if [ -n "$TOX_ENVS" ]; then
+    if [[ -n ${TOX_ENVS:-} ]]; then
         tox -e "$TOX_ENVS" | tee -a "$ARCHIVE_TOX_DIR/tox.log"
         tox_status="${PIPESTATUS[0]}"
     else
@@ -43,21 +52,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"
+    # 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
 
-echo "Completed tox runs."
-
-
 # If docs are generated push them to archives.
 DOC_DIR="${DOC_DIR:-docs/_build/html}"
-if [[ -d "$DOC_DIR" ]]; then
+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"