X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=.jjb-test%2Fexpected-xml%2Fgithub-rtd-rtd-verify-master;h=cf393fbd57d635845fc040b25ba677b7784eff5c;hb=refs%2Fchanges%2F80%2F8380%2F3;hp=50af5e83f04c07f650b5cb1583a3cb543bc4be10;hpb=2ca063107584e86a176d58117c8e30c51650d667;p=releng%2Fglobal-jjb.git diff --git a/.jjb-test/expected-xml/github-rtd-rtd-verify-master b/.jjb-test/expected-xml/github-rtd-rtd-verify-master index 50af5e83..cf393fbd 100644 --- a/.jjb-test/expected-xml/github-rtd-rtd-verify-master +++ b/.jjb-test/expected-xml/github-rtd-rtd-verify-master @@ -83,7 +83,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. - ** + $sha1 @@ -157,12 +157,12 @@ echo "---> tox-install.sh" # DO NOT set -u as virtualenv's activate script has unbound variables set -e -o pipefail -virtualenv --quiet "/tmp/v/tox" +virtualenv --quiet -p "$PYTHON_VERSION" "/tmp/v/tox" # shellcheck source=/tmp/v/tox/bin/activate disable=SC1091 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 argparse detox tox tox-pyenv echo "----> Pip Dependency Tree" pipdeptree @@ -240,9 +240,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.