From: Anil Belur <abelur@linuxfoundation.org>
Date: Thu, 7 Jun 2018 03:04:54 +0000 (+0000)
Subject: Merge "DO NOT fail if global-vars-.sh is not configured"
X-Git-Tag: v0.21.0~20
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=4e9ff649abbfc5dde3125880bae9f71f02971c8f;hp=9dd5c89d184dcedcf65e99320639bb1a18e61c89;p=releng%2Fglobal-jjb.git

Merge "DO NOT fail if global-vars-.sh is not configured"
---

diff --git a/shell/jenkins-configure-global-vars.sh b/shell/jenkins-configure-global-vars.sh
index 6e640232..af36d100 100644
--- a/shell/jenkins-configure-global-vars.sh
+++ b/shell/jenkins-configure-global-vars.sh
@@ -27,6 +27,13 @@ silos="${jenkins_silos:-jenkins}"
 set -eu -o pipefail
 
 for silo in $silos; do
+    if [ ! -f "$WORKSPACE/jenkins-config/global-vars-$silo.sh" ]; then
+        echo "WARN: jenkins-config/global-vars-$silo.sh does not exist. Skipping cloud management..."
+        echo "We highly recommend setting up global-vars-$silo.sh to manage the Jenkins global variables."
+        echo "Refer to https://docs.releng.linuxfoundation.org/projects/global-jjb/en/latest/jjb/lf-ci-jobs.html#global-environment-variables for details."
+        continue
+    fi
+
     set +x  # Ensure that no other scripts add `set -x` and print passwords
     echo "Configuring $silo"