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
Improve packer-validate debugging output
[releng/global-jjb.git]
/
shell
/
tox-run.sh
diff --git
a/shell/tox-run.sh
b/shell/tox-run.sh
index
e24e974
..
e8172b2
100644
(file)
--- a/
shell/tox-run.sh
+++ b/
shell/tox-run.sh
@@
-27,13
+27,17
@@
run_tox() {
local log_dir="$1"
local env="$2"
local log_dir="$1"
local env="$2"
+ # Sleep a random 10 second interval to workaround tox sdist
+ # conflicts due to building in the same dist directory.
+ sleep $[ ( $RANDOM % 10 ) + 1 ]s
+
echo "-----> Running tox $env"
if ! tox -e $env > "$log_dir/tox-$env.log"; then
echo "$env" >> "$log_dir/failed-envs.log"
fi
}
echo "-----> Running tox $env"
if ! tox -e $env > "$log_dir/tox-$env.log"; then
echo "$env" >> "$log_dir/failed-envs.log"
fi
}
-TOX_ENVS=(${TOX_ENVS//,/ })
+IFS=" " read -r -a TOX_ENVS <<< "${TOX_ENVS//,/ }"
if hash parallel 2>/dev/null; then
export -f run_tox
parallel --jobs 200% "run_tox $ARCHIVE_TOX_DIR {}" ::: ${TOX_ENVS[*]}
if hash parallel 2>/dev/null; then
export -f run_tox
parallel --jobs 200% "run_tox $ARCHIVE_TOX_DIR {}" ::: ${TOX_ENVS[*]}
@@
-44,7
+48,11
@@
else
fi
if [ -f "$ARCHIVE_TOX_DIR/failed-envs.log" ]; then
fi
if [ -f "$ARCHIVE_TOX_DIR/failed-envs.log" ]; then
- failed_envs=($(cat "$ARCHIVE_TOX_DIR/failed-envs.log"))
+ mapfile -t failed_envs < <(cat "$ARCHIVE_TOX_DIR/failed-envs.log")
+ for e in "${failed_envs[@]}"; do
+ echo "cat $ARCHIVE_TOX_DIR/tox-$e.log"
+ cat "$ARCHIVE_TOX_DIR/tox-$e.log"
+ done
echo "ERROR: Failed the following builds: ${failed_envs[*]}"
exit 1
fi
echo "ERROR: Failed the following builds: ${failed_envs[*]}"
exit 1
fi