X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;ds=sidebyside;f=.jjb-test%2Fexpected-xml%2Fgerrit-maven-maven-javadoc-verify-master;h=dca94bfd6ab3d58830efffd7af5dc1578a85af1a;hb=refs%2Fchanges%2F44%2F7244%2F4;hp=e964e94cbf817e72a20646b198f7044232ff85ab;hpb=df523ff68c8dbf3ad8eb09ef9cc04825bba86a4f;p=releng%2Fglobal-jjb.git
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 e964e94c..dca94bfd 100644
--- a/.jjb-test/expected-xml/gerrit-maven-maven-javadoc-verify-master
+++ b/.jjb-test/expected-xml/gerrit-maven-maven-javadoc-verify-master
@@ -6,7 +6,7 @@
false
false
false
- false
+ true
build-vm
false
@@ -279,7 +279,11 @@ 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 \
+ -Pq -Dmaven.javadoc.skip=false \
+ -DskipTests=true \
+ -Dcheckstyle.skip=true \
+ -Dfindbugs.skip=true \
--global-settings "$GLOBAL_SETTINGS_FILE" \
--settings "$SETTINGS_FILE" \
$MAVEN_PARAMS $MAVEN_OPTIONS
@@ -382,7 +386,7 @@ echo "---> create-netrc.sh"
# Ensure we fail the job if any steps fail.
set -eu -o pipefail
-NEXUS_URL="${NEXUS_URL:-$NEXUSPROXY}"
+NEXUS_URL="${NEXUSPROXY:-$NEXUS_URL}"
CREDENTIAL=$(xmlstarlet sel -N "x=http://maven.apache.org/SETTINGS/1.0.0" \
-t -m "/x:settings/x:servers/x:server[x:id='${SERVER_ID}']" \
-v x:username -o ":" -v x:password \
@@ -392,7 +396,7 @@ machine=$(echo "$NEXUS_URL" | awk -F/ '{print $3}')
user=$(echo "$CREDENTIAL" | cut -f1 -d:)
pass=$(echo "$CREDENTIAL" | cut -f2 -d:)
-echo "machine $machine login $user password $pass" > ~/.netrc
+echo "machine ${machine%:*} login $user password $pass" > ~/.netrc
@@ -508,7 +512,7 @@ then
echo "WARNING: Logging server not set"
else
- NEXUS_URL="${NEXUS_URL:-$NEXUSPROXY}"
+ NEXUS_URL="${NEXUSPROXY:-$NEXUS_URL}"
NEXUS_PATH="${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}"
BUILD_URL="${BUILD_URL}"