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
Revert "Fix rtd verify job choosing strategy"
[releng/global-jjb.git]
/
shell
/
tox-run.sh
diff --git
a/shell/tox-run.sh
b/shell/tox-run.sh
index
3f1f92a
..
c159891
100644
(file)
--- a/
shell/tox-run.sh
+++ b/
shell/tox-run.sh
@@
-33,16
+33,16
@@
set +e # Allow detox to fail so that we can collect the logs in the next step
PARALLEL="${PARALLEL:-true}"
if [ "${PARALLEL}" = true ]; then
PARALLEL="${PARALLEL:-true}"
if [ "${PARALLEL}" = true ]; then
- if [
! -z
"$TOX_ENVS" ]; then
-
detox -e "$TOX_ENVS" | tee -a "$ARCHIVE_TOX_DIR/de
tox.log"
+ 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_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
tox_status="${PIPESTATUS[0]}"
fi
else
- if [
! -z
"$TOX_ENVS" ]; then
- tox -e "$TOX_ENVS"
| tee -a "$ARCHIVE_TOX_DIR/tox.log"
+ 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]}"
else
tox | tee -a "$ARCHIVE_TOX_DIR/tox.log"
@@
-53,7
+53,7
@@
fi
# Disable SC2116 as we want to echo a space separated list of TOX_ENVS
# shellcheck disable=SC2116
for i in .tox/*/log; do
# Disable SC2116 as we want to echo a space separated list of TOX_ENVS
# shellcheck disable=SC2116
for i in .tox/*/log; do
- tox_env=$(echo
$i
| awk -F'/' '{print $2}')
+ tox_env=$(echo
"$i"
| awk -F'/' '{print $2}')
cp -r "$i" "$ARCHIVE_TOX_DIR/$tox_env"
done
set -e # Logs collected so re-enable
cp -r "$i" "$ARCHIVE_TOX_DIR/$tox_env"
done
set -e # Logs collected so re-enable