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=refs%2Fchanges%2F11%2F8311%2F4;hp=93930444ce78341c828cb6bdc34c42f884399296;hpb=56497ce8f87463a6243bd3fb0b060fce99d58e38;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 93930444..5573a887 100644
--- a/.jjb-test/expected-xml/gerrit-python-tox-verify-master
+++ b/.jjb-test/expected-xml/gerrit-python-tox-verify-master
@@ -166,7 +166,7 @@ Example: docs,py2,py3
false
- false
+ true
false
false
@@ -330,13 +330,17 @@ run_tox() {
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
}
-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[*]}
@@ -347,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
@@ -396,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.
@@ -435,7 +443,7 @@ echo "---> create-netrc.sh"
# Ensure we fail the job if any steps fail.
set -eu -o pipefail
-NEXUS_URL="${NEXUS_URL:-$NEXUSPROXY}"
+NEXUS_URL="${NEXUSPROXY:-$NEXUS_URL}"
CREDENTIAL=$(xmlstarlet sel -N "x=http://maven.apache.org/SETTINGS/1.0.0" \
-t -m "/x:settings/x:servers/x:server[x:id='${SERVER_ID}']" \
-v x:username -o ":" -v x:password \
@@ -445,7 +453,7 @@ machine=$(echo "$NEXUS_URL" | awk -F/ '{print $3}')
user=$(echo "$CREDENTIAL" | cut -f1 -d:)
pass=$(echo "$CREDENTIAL" | cut -f2 -d:)
-echo "machine $machine login $user password $pass" > ~/.netrc
+echo "machine ${machine%:*} login $user password $pass" > ~/.netrc
@@ -561,7 +569,7 @@ then
echo "WARNING: Logging server not set"
else
- NEXUS_URL="${NEXUS_URL:-$NEXUSPROXY}"
+ NEXUS_URL="${NEXUSPROXY:-$NEXUS_URL}"
NEXUS_PATH="${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}"
BUILD_URL="${BUILD_URL}"
@@ -633,5 +641,14 @@ rm ~/.netrc
test-credential
+
+
+
+ npmrc
+ $HOME/.npmrc
+
+
+
+