X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=.jjb-test%2Fexpected-xml%2Fgerrit-maven-maven-verify-deps-master-mvn33-openjdk8;h=13edea6847feb8d2f70a77002776f0dfc7dc5847;hb=048fe0b4d7fdd4d11d1d0fdcbc154b31089b3ac1;hp=f4d4c8c80f695ada8d472784918ecd6fd98622d1;hpb=ddeccf5a8df0fe4478eae61099c0cd3084d02e64;p=releng%2Fglobal-jjb.git diff --git a/.jjb-test/expected-xml/gerrit-maven-maven-verify-deps-master-mvn33-openjdk8 b/.jjb-test/expected-xml/gerrit-maven-maven-verify-deps-master-mvn33-openjdk8 index f4d4c8c8..13edea68 100644 --- a/.jjb-test/expected-xml/gerrit-maven-maven-verify-deps-master-mvn33-openjdk8 +++ b/.jjb-test/expected-xml/gerrit-maven-maven-verify-deps-master-mvn33-openjdk8 @@ -263,7 +263,7 @@ set -eu -o pipefail REPOS_DIR="$WORKSPACE/.repos" -PATCHES=($(echo "$GERRIT_EVENT_COMMENT_TEXT" | grep 'recheck:' | awk -F: '{print $2}')) +IFS=" " read -r -a PATCHES <<< "$(echo "$GERRIT_EVENT_COMMENT_TEXT" | grep 'recheck:' | awk -F: '{print $2}')" projects=() for patch in $(echo "${PATCHES[@]}"); do @@ -340,7 +340,7 @@ echo "$MAVEN_OPTIONS" set -e -o pipefail set +u -PROJECTS=($(echo "$DEPENDENCY_BUILD_ORDER")) +IFS=" " read -r -a PROJECTS <<< "$DEPENDENCY_BUILD_ORDER" REPOS_DIR="$WORKSPACE/.repos" export MAVEN_OPTS @@ -354,7 +354,7 @@ for project in "${PROJECTS[@]}"; do -DskipTests=true \ --global-settings "$GLOBAL_SETTINGS_FILE" \ --settings "$SETTINGS_FILE" \ - $MAVEN_PARAMS $MAVEN_OPTIONS + $MAVEN_OPTIONS $MAVEN_PARAMS popd done @@ -410,7 +410,7 @@ $MVN clean deploy \ --global-settings "$GLOBAL_SETTINGS_FILE" \ --settings "$SETTINGS_FILE" \ -DaltDeploymentRepository=staging::default::file:"$WORKSPACE"/m2repo \ - $MAVEN_PARAMS $MAVEN_OPTIONS + $MAVEN_OPTIONS $MAVEN_PARAMS @@ -509,9 +509,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.