X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;ds=sidebyside;f=.jjb-test%2Fexpected-xml%2Fgithub-maven-maven-verify-master-mvn33-openjdk8;h=1cc1c19e086bf6ca2501e9ec7558f7a8a91983b6;hb=refs%2Fchanges%2F80%2F8380%2F3;hp=af451b2f64f9b3c80eafab54adfb17867d3498d8;hpb=6df0d5a717c1e3c33aae618b80382b491476cd54;p=releng%2Fglobal-jjb.git
diff --git a/.jjb-test/expected-xml/github-maven-maven-verify-master-mvn33-openjdk8 b/.jjb-test/expected-xml/github-maven-maven-verify-master-mvn33-openjdk8
index af451b2f..1cc1c19e 100644
--- a/.jjb-test/expected-xml/github-maven-maven-verify-master-mvn33-openjdk8
+++ b/.jjb-test/expected-xml/github-maven-maven-verify-master-mvn33-openjdk8
@@ -69,6 +69,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
<1.0.0
+
+ M2_HOME
+ Maven selector to be used by shell scripts
+ /w/tools/hudson.tasks.Maven_MavenInstallation/mvn33
+
MAVEN_OPTS
Maven Java opts. Example: -Xmx1024m -XX:MaxPermSize=256m
@@ -92,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.
+
+
@@ -107,7 +117,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
- **
+ $sha1
@@ -327,7 +337,7 @@ $MVN clean deploy \
--global-settings "$GLOBAL_SETTINGS_FILE" \
--settings "$SETTINGS_FILE" \
-DaltDeploymentRepository=staging::default::file:"$WORKSPACE"/m2repo \
- $MAVEN_PARAMS $MAVEN_OPTIONS
+ $MAVEN_OPTIONS $MAVEN_PARAMS
@@ -426,9 +436,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.
@@ -475,7 +485,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
@@ -663,5 +673,14 @@ rm ~/.netrc
test-credential
+
+
+
+ npmrc
+ $HOME/.npmrc
+
+
+
+