X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;ds=sidebyside;f=.jjb-test%2Fexpected-xml%2Fgerrit-python-tox-verify-master;h=5573a8874ee9392cdb7bb740e9d15c021b2bdb25;hb=bb5e0da850b1c5ed31cf76af62d91b506c13d8dd;hp=508a4f98aad8de84cd91ca83f97b82862ef776e4;hpb=3577c6f3469752c9ff64742002a5b235d774001b;p=releng%2Fglobal-jjb.git
diff --git a/.jjb-test/expected-xml/gerrit-python-tox-verify-master b/.jjb-test/expected-xml/gerrit-python-tox-verify-master
index 508a4f98..5573a887 100644
--- a/.jjb-test/expected-xml/gerrit-python-tox-verify-master
+++ b/.jjb-test/expected-xml/gerrit-python-tox-verify-master
@@ -340,7 +340,7 @@ run_tox() {
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[*]}
@@ -351,7 +351,11 @@ else
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
@@ -400,9 +404,9 @@ SAR_DIR="$WORKSPACE/archives/sar-reports"
mkdir -p "$SAR_DIR"
cp "$SYSSTAT_PATH/"* "$_"
# convert sar data to ascii format
-while IFS="" read -r s
+while IFS="" read -r sarfilenum
do
- [ -f "$s" ] && LC_TIME=POSIX sar -A -f "$s" > "$SAR_DIR/sar${s//[!0-9]/}"
+ [ -f "$sarfilenum" ] && LC_TIME=POSIX sar -A -f "$sarfilenum" > "$SAR_DIR/sar${sarfilenum//[!0-9]/}"
done < <(find "$SYSSTAT_PATH" -name "sa[0-9]*" || true)
# DON'T fail build if script fails.
@@ -637,5 +641,14 @@ rm ~/.netrc
test-credential
+
+
+
+ npmrc
+ $HOME/.npmrc
+
+
+
+