From: Andrew Grimberg <agrimberg@linuxfoundation.org>
Date: Thu, 7 Jun 2018 15:13:14 +0000 (+0000)
Subject: Merge "Handle missing CREDENTIAL when creating .netrc"
X-Git-Tag: v0.21.0~19
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=1e36a6a0ca22ef66f80dde0258fd1d383776f63b;hp=4e9ff649abbfc5dde3125880bae9f71f02971c8f;p=releng%2Fglobal-jjb.git

Merge "Handle missing CREDENTIAL when creating .netrc"
---

diff --git a/shell/create-netrc.sh b/shell/create-netrc.sh
index 50a419c9..a123be8d 100644
--- a/shell/create-netrc.sh
+++ b/shell/create-netrc.sh
@@ -10,23 +10,29 @@
 ##############################################################################
 echo "---> create-netrc.sh"
 
-# Ensure we fail the job if any steps fail.
-set -eu -o pipefail
-
-ALT_NEXUS_URL="${ALT_NEXUS_URL:-}"
-
-if [ -z "$ALT_NEXUS_URL" ]
-then
+if [ -z "$ALT_NEXUS_URL" ]; then
     NEXUS_URL="${NEXUSPROXY:-$NEXUS_URL}"
 else
     NEXUS_URL="${ALT_NEXUS_URL}"
 fi
-
 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 \
     "$SETTINGS_FILE")
 
+# Ensure we fail the job if any steps fail.
+set -eu -o pipefail
+
+# Handle when a project chooses to not archive logs to a log server
+# in other cases if CREDENTIAL is not found then fail the build.
+if [ -z "$CREDENTIAL" ] && [ "$SERVER_ID" == "logs" ]; then
+    echo "WARN: Log server credential not found."
+    exit 0
+elif [ -z "$CREDENTIAL" ]; then
+    echo "ERROR: Credential not found."
+    exit 1
+fi
+
 machine=$(echo "$NEXUS_URL" | awk -F/ '{print $3}')
 user=$(echo "$CREDENTIAL" | cut -f1 -d:)
 pass=$(echo "$CREDENTIAL" | cut -f2 -d:)