X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=.jjb-test%2Fexpected-xml%2Fgerrit-ciman-jjb-verify;h=656a02223c6f7f08763686c97eb315e643aeff37;hb=2069fa3b9c656c59fc93c77bf0ba80a18c0ddc00;hp=2a9896fa1470f657dbd93502fd99fc1d159d1112;hpb=f20644a41ef340d5bf31937644eb242c646e52c4;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 2a9896fa..656a0222 100644 --- a/.jjb-test/expected-xml/gerrit-ciman-jjb-verify +++ b/.jjb-test/expected-xml/gerrit-ciman-jjb-verify @@ -303,7 +303,7 @@ popd ############################################################################## echo "---> jjb-check-unicode.sh" -if LC_ALL=C grep --exclude=docs/ -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}"