From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Thu, 2 Nov 2017 14:36:59 +0000 (-0400)
Subject: Add install goal to javadoc job
X-Git-Tag: v0.11.1~2
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;ds=inline;h=ad67fc6240c02acc3e5137fdef696d383b757603;p=releng%2Fglobal-jjb.git

Add install goal to javadoc job

It turns out javadoc needs to have the artifacts available to them in
order to run javadoc:aggregate. In some cases this means artifacts
installed to the local maven repo. This patch adds the install goal as
well as ensuring we continue to skip tests, checkstyle, and findbugs to
keep the jobs running quick.

Change-Id: I3ffa36b207a1412e0489d6c20a91ffcd3ac93c27
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---

diff --git a/.jjb-test/expected-xml/gerrit-maven-maven-javadoc-publish-master b/.jjb-test/expected-xml/gerrit-maven-maven-javadoc-publish-master
index 23fbcb8e..78937cc3 100644
--- a/.jjb-test/expected-xml/gerrit-maven-maven-javadoc-publish-master
+++ b/.jjb-test/expected-xml/gerrit-maven-maven-javadoc-publish-master
@@ -313,7 +313,10 @@ export MAVEN_OPTS
 
 # Disable SC2086 because we want to allow word splitting for $MAVEN_* parameters.
 # shellcheck disable=SC2086
-$MVN clean javadoc:aggregate \
+$MVN clean install javadoc:aggregate \
+    -DskipTests=true \
+    -Dcheckstyle.skip=true \
+    -Dfindbugs.skip=true \
     --global-settings &quot;$GLOBAL_SETTINGS_FILE&quot; \
     --settings &quot;$SETTINGS_FILE&quot; \
     $MAVEN_PARAMS $MAVEN_OPTIONS
diff --git a/.jjb-test/expected-xml/gerrit-maven-maven-javadoc-verify-master b/.jjb-test/expected-xml/gerrit-maven-maven-javadoc-verify-master
index 8f16a851..73d3e4cd 100644
--- a/.jjb-test/expected-xml/gerrit-maven-maven-javadoc-verify-master
+++ b/.jjb-test/expected-xml/gerrit-maven-maven-javadoc-verify-master
@@ -279,7 +279,10 @@ export MAVEN_OPTS
 
 # Disable SC2086 because we want to allow word splitting for $MAVEN_* parameters.
 # shellcheck disable=SC2086
-$MVN clean javadoc:aggregate \
+$MVN clean install javadoc:aggregate \
+    -DskipTests=true \
+    -Dcheckstyle.skip=true \
+    -Dfindbugs.skip=true \
     --global-settings &quot;$GLOBAL_SETTINGS_FILE&quot; \
     --settings &quot;$SETTINGS_FILE&quot; \
     $MAVEN_PARAMS $MAVEN_OPTIONS
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 b899d3eb..ce1b1b40 100644
--- a/.jjb-test/expected-xml/github-maven-maven-javadoc-publish-master
+++ b/.jjb-test/expected-xml/github-maven-maven-javadoc-publish-master
@@ -289,7 +289,10 @@ export MAVEN_OPTS
 
 # Disable SC2086 because we want to allow word splitting for $MAVEN_* parameters.
 # shellcheck disable=SC2086
-$MVN clean javadoc:aggregate \
+$MVN clean install javadoc:aggregate \
+    -DskipTests=true \
+    -Dcheckstyle.skip=true \
+    -Dfindbugs.skip=true \
     --global-settings &quot;$GLOBAL_SETTINGS_FILE&quot; \
     --settings &quot;$SETTINGS_FILE&quot; \
     $MAVEN_PARAMS $MAVEN_OPTIONS
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 63b64e2d..3af8b1e3 100644
--- a/.jjb-test/expected-xml/github-maven-maven-javadoc-verify-master
+++ b/.jjb-test/expected-xml/github-maven-maven-javadoc-verify-master
@@ -241,7 +241,10 @@ export MAVEN_OPTS
 
 # Disable SC2086 because we want to allow word splitting for $MAVEN_* parameters.
 # shellcheck disable=SC2086
-$MVN clean javadoc:aggregate \
+$MVN clean install javadoc:aggregate \
+    -DskipTests=true \
+    -Dcheckstyle.skip=true \
+    -Dfindbugs.skip=true \
     --global-settings &quot;$GLOBAL_SETTINGS_FILE&quot; \
     --settings &quot;$SETTINGS_FILE&quot; \
     $MAVEN_PARAMS $MAVEN_OPTIONS
diff --git a/shell/maven-javadoc-generate.sh b/shell/maven-javadoc-generate.sh
index aa485c0c..bf64d2c8 100644
--- a/shell/maven-javadoc-generate.sh
+++ b/shell/maven-javadoc-generate.sh
@@ -23,7 +23,10 @@ export MAVEN_OPTS
 
 # Disable SC2086 because we want to allow word splitting for $MAVEN_* parameters.
 # shellcheck disable=SC2086
-$MVN clean javadoc:aggregate \
+$MVN clean install javadoc:aggregate \
+    -DskipTests=true \
+    -Dcheckstyle.skip=true \
+    -Dfindbugs.skip=true \
     --global-settings "$GLOBAL_SETTINGS_FILE" \
     --settings "$SETTINGS_FILE" \
     $MAVEN_PARAMS $MAVEN_OPTIONS