X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;ds=inline;f=.jjb-test%2Fexpected-xml%2Fgerrit-maven-maven-clm-master;h=94560692f8616bb2aee7b35b07f80826d21b8f13;hb=refs%2Fchanges%2F91%2F8391%2F1;hp=c7fcce82e2ef1d02aba55c7c3d58a7b9d5d7e872;hpb=2069fa3b9c656c59fc93c77bf0ba80a18c0ddc00;p=releng%2Fglobal-jjb.git
diff --git a/.jjb-test/expected-xml/gerrit-maven-maven-clm-master b/.jjb-test/expected-xml/gerrit-maven-maven-clm-master
index c7fcce82..94560692 100644
--- a/.jjb-test/expected-xml/gerrit-maven-maven-clm-master
+++ b/.jjb-test/expected-xml/gerrit-maven-maven-clm-master
@@ -102,6 +102,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
uuddlrlrba
+
+ ARCHIVE_ARTIFACTS
+ Artifacts to archive to the logs server.
+
+
@@ -120,28 +125,22 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
refs/heads/$GERRIT_BRANCH
-
-
false
- false
- true
- false
false
Default
-
- true
-
- false
- false
+
+
+
false
true
false
+ false
10
@@ -152,6 +151,51 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
H H * * 6
+
+
+
+
+ ANT
+ releng/ciman
+
+
+ ANT
+ **/master
+
+
+ false
+
+
+
+ true
+ true
+ true
+ true
+
+ false
+ false
+ true
+ false
+ false
+
+
+ False
+
+ false
+
+
+ run-clm$
+
+
+
+
+
+
+
+
+
+ test-server
+
@@ -233,7 +277,7 @@ $MVN clean install dependency:tree com.sonatype.clm:clm-maven-plugin:index \
--global-settings "$GLOBAL_SETTINGS_FILE" \
--settings "$SETTINGS_FILE" \
-DaltDeploymentRepository=staging::default::file:"$WORKSPACE"/m2repo \
- $MAVEN_PARAMS $MAVEN_OPTIONS
+ $MAVEN_OPTIONS $MAVEN_PARAMS
@@ -310,9 +354,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.
@@ -359,7 +403,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
@@ -534,7 +578,7 @@ rm ~/.netrc
- 15
+ 30
BUILD_TIMEOUT
true
false
@@ -547,5 +591,14 @@ rm ~/.netrc
test-credential
+
+
+
+ npmrc
+ $HOME/.npmrc
+
+
+
+