X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;ds=sidebyside;f=.jjb-test%2Fexpected-xml%2Fgithub-maven-maven-javadoc-publish-master;h=07cf871e1874a25a77b586fa0acd29093e461295;hb=refs%2Fchanges%2F51%2F8351%2F2;hp=636851e7e8feed60bb46231105c04e8b27b32b1e;hpb=2ca063107584e86a176d58117c8e30c51650d667;p=releng%2Fglobal-jjb.git
diff --git a/.jjb-test/expected-xml/github-maven-maven-javadoc-publish-master b/.jjb-test/expected-xml/github-maven-maven-javadoc-publish-master
index 636851e7..07cf871e 100644
--- a/.jjb-test/expected-xml/github-maven-maven-javadoc-publish-master
+++ b/.jjb-test/expected-xml/github-maven-maven-javadoc-publish-master
@@ -97,6 +97,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
uuddlrlrba
+
+ ARCHIVE_ARTIFACTS
+ Artifacts to archive to the logs server.
+
+
@@ -112,7 +117,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
- **
+ master
@@ -296,7 +301,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"
@@ -469,9 +474,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.