Bump to v0.12.0-dev

[releng/global-jjb.git] / .jjb-test / expected-xml / github-ciman-jjb-verify

diff --git a/.jjb-test/expected-xml/github-ciman-jjb-verify b/.jjb-test/expected-xml/github-ciman-jjb-verify
index 3a10bb8..4837153 100644 (file)
--- a/.jjb-test/expected-xml/github-ciman-jjb-verify
+++ b/.jjb-test/expected-xml/github-ciman-jjb-verify
@@ -251,7 +251,7 @@ popd
 ##############################################################################
 echo "---> jjb-check-unicode.sh"
 
-if LC_ALL=C grep -r '[^[:print:][:space:]]' jjb/; then
+if LC_ALL=C grep -I -r '[^[:print:][:space:]]' jjb/; then
     echo "Found files containing non-ascii characters."
     exit 1
 fi
@@ -362,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 \
@@ -372,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
 </command>
         </hudson.tasks.Shell>
         <hudson.tasks.Shell>
@@ -488,7 +488,7 @@ then
 
     echo &quot;WARNING: Logging server not set&quot;
 else
-    NEXUS_URL=&quot;${NEXUS_URL:-$NEXUSPROXY}&quot;
+    NEXUS_URL=&quot;${NEXUSPROXY:-$NEXUS_URL}&quot;
     NEXUS_PATH=&quot;${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}&quot;
     BUILD_URL=&quot;${BUILD_URL}&quot;