Code Review
/
releng
/
global-jjb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add Gerrit trigger to clm job
[releng/global-jjb.git]
/
.jjb-test
/
expected-xml
/
github-maven-maven-javadoc-publish-master
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
90f8552
..
07cf871
100644
(file)
--- 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'.
</description>
<defaultValue>uuddlrlrba</defaultValue>
</hudson.model.StringParameterDefinition>
</description>
<defaultValue>uuddlrlrba</defaultValue>
</hudson.model.StringParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>ARCHIVE_ARTIFACTS</name>
+ <description>Artifacts to archive to the logs server.</description>
+ <defaultValue/>
+ </hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
</properties>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
</properties>
@@
-112,7
+117,7
@@
For example '<1.0.0' or '>=1.0.0,<2.0.0'.
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
- <name>
**
</name>
+ <name>
master
</name>
</hudson.plugins.git.BranchSpec>
</branches>
<excludedUsers/>
</hudson.plugins.git.BranchSpec>
</branches>
<excludedUsers/>
@@
-289,10
+294,14
@@
export MAVEN_OPTS
# Disable SC2086 because we want to allow word splitting for $MAVEN_* parameters.
# shellcheck disable=SC2086
# Disable SC2086 because we want to allow word splitting for $MAVEN_* parameters.
# shellcheck disable=SC2086
-$MVN clean javadoc:aggregate \
+$MVN clean install javadoc:aggregate \
+ -Pq -Dmaven.javadoc.skip=false \
+ -DskipTests=true \
+ -Dcheckstyle.skip=true \
+ -Dfindbugs.skip=true \
--global-settings "$GLOBAL_SETTINGS_FILE" \
--settings "$SETTINGS_FILE" \
--global-settings "$GLOBAL_SETTINGS_FILE" \
--settings "$SETTINGS_FILE" \
- $MAVEN_
PARAMS $MAVEN_OPTION
S
+ $MAVEN_
OPTIONS $MAVEN_PARAM
S
mv "$WORKSPACE/target/site/apidocs" "$JAVADOC_DIR"
mv "$WORKSPACE/target/site/apidocs" "$JAVADOC_DIR"
@@
-465,9
+474,9
@@
SAR_DIR="$WORKSPACE/archives/sar-reports"
mkdir -p "$SAR_DIR"
cp "$SYSSTAT_PATH/"* "$_"
# convert sar data to ascii format
mkdir -p "$SAR_DIR"
cp "$SYSSTAT_PATH/"* "$_"
# convert sar data to ascii format
-while IFS="" read -r s
+while IFS="" read -r s
arfilenum
do
do
- [ -f "$s
" ] && LC_TIME=POSIX sar -A -f "$s" > "$SAR_DIR/sar${s
//[!0-9]/}"
+ [ -f "$s
arfilenum" ] && 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.
done < <(find "$SYSSTAT_PATH" -name "sa[0-9]*" || true)
# DON'T fail build if script fails.