X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=.jjb-test%2Fexpected-xml%2Fgerrit-rtd-rtd-verify-master;h=b800fefc6feef35a677c8297c934d11f1b0766d6;hb=refs%2Fchanges%2F89%2F8389%2F1;hp=8b9a99ca5e1798ca9a4a31dace98695333e309d9;hpb=f2d509dec375118ad366e929930b0716132850c3;p=releng%2Fglobal-jjb.git diff --git a/.jjb-test/expected-xml/gerrit-rtd-rtd-verify-master b/.jjb-test/expected-xml/gerrit-rtd-rtd-verify-master index 8b9a99ca..b800fefc 100644 --- a/.jjb-test/expected-xml/gerrit-rtd-rtd-verify-master +++ b/.jjb-test/expected-xml/gerrit-rtd-rtd-verify-master @@ -91,28 +91,22 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. refs/heads/$GERRIT_BRANCH - - false - false - true - false false Default - - true - - false - false + + + false true false + false 10 @@ -205,12 +199,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 @@ -288,9 +282,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.