Fix: Address various shellcheck linting errors in scripts

[releng/global-jjb.git] / shell / tox-run.sh

diff --git a/shell/tox-run.sh b/shell/tox-run.sh
index 498ddc7..b30ea67 100644 (file)
--- a/shell/tox-run.sh
+++ b/shell/tox-run.sh
@@ -13,11 +13,19 @@ 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
 
+# shellcheck disable=SC1090
+source ~/lf-env.sh
+
+lf-activate-venv --venv-file /tmp/.toxenv tox virtualenv urllib3~=1.26.15
+
 if [[ -d /opt/pyenv ]]; then
     echo "---> Setting up pyenv"
     export PYENV_ROOT="/opt/pyenv"
@@ -27,24 +35,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"