X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Ftox-run.sh;h=68a5af9420f2c13d898b44876bd0ed719fad6cf8;hb=4d1aaad578d2bc185b281964c95980267300ecb2;hp=d7f4be2b5ba651b805a309cdcf0c3c0cbbbb9f00;hpb=cf8b441e368ad0ce9e8c2e0b8ddb7aad0d7d690c;p=releng%2Fglobal-jjb.git diff --git a/shell/tox-run.sh b/shell/tox-run.sh index d7f4be2b..68a5af94 100644 --- a/shell/tox-run.sh +++ b/shell/tox-run.sh @@ -13,11 +13,8 @@ echo "---> tox-run.sh" # do not use -o pipefail set -eux -# shellcheck disable=SC1090 -source ~/lf-env.sh - -# Version controlled by JJB_VERSION -lf-activate-venv readline +#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" @@ -33,6 +30,9 @@ 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