X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;ds=inline;f=.jjb-test%2Fexpected-xml%2Fgithub-maven-maven-clm-master;h=1fa9c11f417172c1e2ab3f1e1b95cfcb3e9687c1;hb=8bacaf67000180245721363de6f699c32ee5da35;hp=784044c628bba2568cb08c73ec3bad920960711a;hpb=df523ff68c8dbf3ad8eb09ef9cc04825bba86a4f;p=releng%2Fglobal-jjb.git
diff --git a/.jjb-test/expected-xml/github-maven-maven-clm-master b/.jjb-test/expected-xml/github-maven-maven-clm-master
index 784044c6..1fa9c11f 100644
--- a/.jjb-test/expected-xml/github-maven-maven-clm-master
+++ b/.jjb-test/expected-xml/github-maven-maven-clm-master
@@ -10,8 +10,9 @@
build-vm
false
-
+
$GIT_URL/$PROJECT/example-org/releng/ciman
+
@@ -97,6 +98,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
uuddlrlrba
+
+ ARCHIVE_ARTIFACTS
+ Artifacts to archive to the logs server.
+
+
@@ -105,38 +111,32 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
origin
- +refs/pull/*:refs/remotes/origin/pr/*
+
git@github.com:example-org/releng/ciman
test-credential
- **
+ refs/heads/master
-
-
false
- false
- true
- false
false
Default
-
- true
-
- false
- false
+
+
+
false
true
false
+ false
10
@@ -144,9 +144,27 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
-
- H H * * 6
-
+
+
+
+ false
+
+
+
+
+
+ ^run-clm$
+
+ false
+ true
+ true
+ false
+
+
+ CLM
+
+
+
@@ -228,7 +246,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
@@ -305,9 +323,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.
@@ -344,7 +362,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 \
@@ -354,7 +372,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
@@ -470,7 +488,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}"
@@ -529,7 +547,7 @@ rm ~/.netrc
- 15
+ 30
BUILD_TIMEOUT
true
false
@@ -542,5 +560,14 @@ rm ~/.netrc
test-credential
+
+
+
+ npmrc
+ $HOME/.npmrc
+
+
+
+