From: Andrew Grimberg <agrimberg@linuxfoundation.org>
Date: Mon, 13 May 2019 20:05:10 +0000 (-0700)
Subject: Fix LOGS_SERVER to not be required
X-Git-Tag: v0.38.0~13
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=2fcbf4fa3227c46a3fe8a002ed7435234a66dcb2;p=releng%2Fglobal-jjb.git

Fix LOGS_SERVER to not be required

Change 0251b7fda7266760bd82a6e56a696160822a57a0 added in a regression
that forces LOGS_SERVER to be defined when it is not supposed to be
required for jobs.

Change-Id: I3800371e831616c9e9332d0a43e3721d8580a834
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
---

diff --git a/releasenotes/notes/fix_logs_server-4391c56780db6c17.yaml b/releasenotes/notes/fix_logs_server-4391c56780db6c17.yaml
new file mode 100644
index 00000000..561e327a
--- /dev/null
+++ b/releasenotes/notes/fix_logs_server-4391c56780db6c17.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Fix log shipping script to not require a LOGS_SERVER. There was a regression
+    that caused the log shipping script to start requiring a LOGS_SERVER which
+    fails in the case of a system that does not have that optional environment
+    variable set.
diff --git a/shell/logs-deploy.sh b/shell/logs-deploy.sh
index 359642ad..aee1b813 100644
--- a/shell/logs-deploy.sh
+++ b/shell/logs-deploy.sh
@@ -13,7 +13,7 @@ echo "---> logs-deploy.sh"
 # Ensure we fail the job if any steps fail.
 set -eu -o pipefail
 
-if [[ -z $LOGS_SERVER ]]; then
+if [[ -z $"${LOGS_SERVER:-}" ]]; then
     echo "WARNING: Logging server not set"
 else
     nexus_url="${NEXUSPROXY:-$NEXUS_URL}"