X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=.jjb-test%2Fexpected-xml%2Fgithub-ciman-packer-merge-ubuntu1604-mininet;h=ad77ab4cdc225bdd6f1bbc73ae9850c6d777b3e2;hb=6f46b9b1fdec62f4fa7f435cb9b0b11cd151a99a;hp=de4012e61a4c6fc250662c92505bf4a6c0431cf2;hpb=3577c6f3469752c9ff64742002a5b235d774001b;p=releng%2Fglobal-jjb.git diff --git a/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet b/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet index de4012e6..ad77ab4c 100644 --- a/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet +++ b/.jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet @@ -88,7 +88,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. - ** + refs/heads/master @@ -413,9 +413,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. @@ -650,5 +650,14 @@ rm ~/.netrc test-credential + + + + npmrc + $HOME/.npmrc + + + +