X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Ftox-run.sh;h=b30ea67d9141efd433f30aad17f403c2215c69b8;hb=9268e4ab2c79a5605c59865ac5dd96231de75518;hp=682650c92815dcd146871ae78fec73960577f499;hpb=2c9b698e85fc55f3a0b865d5407044a05986736a;p=releng%2Fglobal-jjb.git

diff --git a/shell/tox-run.sh b/shell/tox-run.sh
index 682650c9..b30ea67d 100644
--- a/shell/tox-run.sh
+++ b/shell/tox-run.sh
@@ -21,6 +21,11 @@ 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"
@@ -40,9 +45,15 @@ if [[ -n ${TOX_ENVS:-} ]]; then
     TOX_OPTIONS_LIST=$TOX_OPTIONS_LIST" -e $TOX_ENVS"
 fi;
 
-if [[ ${PARALLEL,,} = true ]]; then
-    TOX_OPTIONS_LIST=$TOX_OPTIONS_LIST" --parallel auto --parallel-live"
-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