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
Change sonar trigger to run-sonar
[releng/global-jjb.git]
/
shell
/
tox-run.sh
diff --git
a/shell/tox-run.sh
b/shell/tox-run.sh
index
90bd546
..
c159891
100644
(file)
--- a/
shell/tox-run.sh
+++ b/
shell/tox-run.sh
@@
-34,15
+34,15
@@
set +e # Allow detox to fail so that we can collect the logs in the next step
PARALLEL="${PARALLEL:-true}"
if [ "${PARALLEL}" = true ]; then
if [ -n "$TOX_ENVS" ]; then
PARALLEL="${PARALLEL:-true}"
if [ "${PARALLEL}" = true ]; then
if [ -n "$TOX_ENVS" ]; then
-
detox -e "$TOX_ENVS" | tee -a "$ARCHIVE_TOX_DIR/de
tox.log"
+
tox -e "$TOX_ENVS" --parallel auto --parallel-live | tee -a "$ARCHIVE_TOX_DIR/
tox.log"
tox_status="${PIPESTATUS[0]}"
else
tox_status="${PIPESTATUS[0]}"
else
-
detox | tee -a "$ARCHIVE_TOX_DIR/de
tox.log"
+
tox --parallel auto --parallel-live | tee -a "$ARCHIVE_TOX_DIR/
tox.log"
tox_status="${PIPESTATUS[0]}"
fi
else
if [ -n "$TOX_ENVS" ]; then
tox_status="${PIPESTATUS[0]}"
fi
else
if [ -n "$TOX_ENVS" ]; then
- tox -e "$TOX_ENVS"
| tee -a "$ARCHIVE_TOX_DIR/tox.log"
+ 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]}"
else
tox | tee -a "$ARCHIVE_TOX_DIR/tox.log"