X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;ds=inline;f=.jjb-test%2Fexpected-xml%2Fgerrit-ciman-jjb-verify;h=656a02223c6f7f08763686c97eb315e643aeff37;hb=refs%2Fchanges%2F30%2F7030%2F1;hp=9d9a12aa2b3846789242a40f52c442d4a44a95fc;hpb=edfa29a8c96d89230344136b88f8cd289dc13fda;p=releng%2Fglobal-jjb.git
diff --git a/.jjb-test/expected-xml/gerrit-ciman-jjb-verify b/.jjb-test/expected-xml/gerrit-ciman-jjb-verify
index 9d9a12aa..656a0222 100644
--- a/.jjb-test/expected-xml/gerrit-ciman-jjb-verify
+++ b/.jjb-test/expected-xml/gerrit-ciman-jjb-verify
@@ -172,7 +172,7 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
false
- false
+ true
false
false
@@ -303,7 +303,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
@@ -414,7 +414,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 \
@@ -540,7 +540,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}"