X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=.jjb-test%2Fexpected-xml%2Fgithub-maven-maven-clm-master;h=ddd663c5e5d970274f2a60331f07614dd800074c;hb=refs%2Fchanges%2F47%2F8347%2F3;hp=2ed8491fc3d3977a705c69ad45c766ad19e1622e;hpb=bd303903ee1d12dd5618106b1dad1f7b0a41983a;p=releng%2Fglobal-jjb.git diff --git a/.jjb-test/expected-xml/github-maven-maven-clm-master b/.jjb-test/expected-xml/github-maven-maven-clm-master index 2ed8491f..ddd663c5 100644 --- a/.jjb-test/expected-xml/github-maven-maven-clm-master +++ b/.jjb-test/expected-xml/github-maven-maven-clm-master @@ -233,7 +233,7 @@ $MVN clean install dependency:tree com.sonatype.clm:clm-maven-plugin:index \ --global-settings "$GLOBAL_SETTINGS_FILE" \ --settings "$SETTINGS_FILE" \ -DaltDeploymentRepository=staging::default::file:"$WORKSPACE"/m2repo \ - $MAVEN_PARAMS $MAVEN_OPTIONS + $MAVEN_OPTIONS $MAVEN_PARAMS @@ -310,9 +310,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. @@ -534,7 +534,7 @@ rm ~/.netrc - 15 + 30 BUILD_TIMEOUT true false