X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;ds=inline;f=.jjb-test%2Fexpected-xml%2Fgithub-python-tox-verify-master;h=9cd8ea3038af0b01c0032ab2123cf3c28665ce07;hb=25d3bb45eaf1e25522b680cac541416a59e65085;hp=1a6f8264637dfe17b2f1e9e37417dcbf440b0059;hpb=6df0d5a717c1e3c33aae618b80382b491476cd54;p=releng%2Fglobal-jjb.git
diff --git a/.jjb-test/expected-xml/github-python-tox-verify-master b/.jjb-test/expected-xml/github-python-tox-verify-master
index 1a6f8264..9cd8ea30 100644
--- a/.jjb-test/expected-xml/github-python-tox-verify-master
+++ b/.jjb-test/expected-xml/github-python-tox-verify-master
@@ -96,7 +96,7 @@ Example: docs,py2,py3
- **
+ $sha1
@@ -258,7 +258,7 @@ virtualenv --quiet "/tmp/v/tox"
source "/tmp/v/tox/bin/activate"
pip install --quiet --upgrade pip
pip install --quiet --upgrade pipdeptree
-pip install --quiet --upgrade tox argparse
+pip install --quiet --upgrade detox tox argparse
echo "----> Pip Dependency Tree"
pipdeptree
@@ -284,39 +284,17 @@ mkdir -p "$ARCHIVE_TOX_DIR"
cd "$WORKSPACE/$TOX_DIR"
-if [ -z "$TOX_ENVS" ]; then
- TOX_ENVS=$(crudini --get tox.ini tox envlist)
-fi
-
-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//,/ })
-if hash parallel 2>/dev/null; then
- export -f run_tox
- parallel --jobs 200% "run_tox $ARCHIVE_TOX_DIR {}" ::: ${TOX_ENVS[*]}
+if [ ! -z "$TOX_ENVS" ]; then
+ detox -e "$TOX_ENVS" | tee -a "$ARCHIVE_TOX_DIR/detox.log"
else
- for env in "${TOX_ENVS[@]}"; do
- run_tox "$ARCHIVE_TOX_DIR" "$env"
- done
+ detox | tee -a "$ARCHIVE_TOX_DIR/detox.log"
fi
-if [ -f "$ARCHIVE_TOX_DIR/failed-envs.log" ]; then
- failed_envs=($(cat "$ARCHIVE_TOX_DIR/failed-envs.log"))
- echo "ERROR: Failed the following builds: ${failed_envs[*]}"
- exit 1
-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."
@@ -362,9 +340,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.
@@ -411,7 +389,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
@@ -599,5 +577,14 @@ rm ~/.netrc
test-credential
+
+
+
+ npmrc
+ $HOME/.npmrc
+
+
+
+