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 "Add script to print all creds in Jenkins"
[releng/global-jjb.git]
/
shell
/
tox-run.sh
diff --git
a/shell/tox-run.sh
b/shell/tox-run.sh
index
ef2481d
..
97f8855
100644
(file)
--- a/
shell/tox-run.sh
+++ b/
shell/tox-run.sh
@@
-14,11
+14,21
@@
echo "---> tox-run.sh"
# DO NOT set -u as virtualenv's activate script has unbound variables
set -e -o pipefail
# DO NOT set -u as virtualenv's activate script has unbound variables
set -e -o pipefail
+ARCHIVE_TOX_DIR="$WORKSPACE/archives/tox"
+mkdir -p "$ARCHIVE_TOX_DIR"
+
cd "$WORKSPACE/$TOX_DIR"
cd "$WORKSPACE/$TOX_DIR"
-if [ -n "$TOX_ENVS" ];
-then
- tox -e "$TOX_ENVS"
+if [ ! -z "$TOX_ENVS" ]; then
+ detox -e "$TOX_ENVS" | tee -a "$ARCHIVE_TOX_DIR/detox.log"
else
else
- tox
+ detox | tee -a "$ARCHIVE_TOX_DIR/detox.log"
fi
fi
+
+# Disable SC2116 as we want to echo a space separated list of TOX_ENVS
+# shellcheck disable=SC2116
+for i in $(echo "${TOX_ENVS//,/ }"); do
+ cp -r ".tox/$i/log" "$ARCHIVE_TOX_DIR/$i"
+done
+
+echo "Completed tox runs."