Code Review
/
releng
/
global-jjb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Update the create script with V3 flavors."
[releng/global-jjb.git]
/
shell
/
tox-run.sh
diff --git
a/shell/tox-run.sh
b/shell/tox-run.sh
index
d7f4be2
..
68a5af9
100644
(file)
--- 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
# 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"
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
export TOX_TESTENV_PASSENV=PYTHONPATH
fi
+#Useful debug
+tox --version
+
PARALLEL="${PARALLEL:-true}"
if [[ ${PARALLEL,,} = true ]]; then
if [[ -n ${TOX_ENVS:-} ]]; then
PARALLEL="${PARALLEL:-true}"
if [[ ${PARALLEL,,} = true ]]; then
if [[ -n ${TOX_ENVS:-} ]]; then