X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;ds=inline;f=.jjb-test%2Fexpected-xml%2Fgithub-maven-maven-javadoc-verify-master;h=6c573c6d95e4705dd886904500f480e9fd252589;hb=25d3bb45eaf1e25522b680cac541416a59e65085;hp=72318d2ab846add08a00aef0c5ad059b35065fb2;hpb=5a5524c53ec347a3230c34f29a963d87c685f37d;p=releng%2Fglobal-jjb.git
diff --git a/.jjb-test/expected-xml/github-maven-maven-javadoc-verify-master b/.jjb-test/expected-xml/github-maven-maven-javadoc-verify-master
index 72318d2a..6c573c6d 100644
--- a/.jjb-test/expected-xml/github-maven-maven-javadoc-verify-master
+++ b/.jjb-test/expected-xml/github-maven-maven-javadoc-verify-master
@@ -117,7 +117,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
- **
+ $sha1
@@ -253,7 +253,7 @@ $MVN clean install javadoc:aggregate \
-Dfindbugs.skip=true \
--global-settings "$GLOBAL_SETTINGS_FILE" \
--settings "$SETTINGS_FILE" \
- $MAVEN_PARAMS $MAVEN_OPTIONS
+ $MAVEN_OPTIONS $MAVEN_PARAMS
mv "$WORKSPACE/target/site/apidocs" "$JAVADOC_DIR"
@@ -314,9 +314,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.