From: Tim Johnson <tijohnson@linuxfoundation.org>
Date: Mon, 27 May 2019 22:57:04 +0000 (-0700)
Subject: Pass multiple pattern args in logs-deploy.sh
X-Git-Tag: v0.38.0~1
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=8e91e5435df00bb187e29147625a9c3bb5d78307;p=releng%2Fglobal-jjb.git

Pass multiple pattern args in logs-deploy.sh

Pass multiple args from ARCHIVE_ARTIFACTS as separate '-p' arguments to
'lftools deploy'

RELENG-2039
Change-Id: I35475a20e499731aac454b66fbb347c7d861f609
Signed-off-by: Tim Johnson <tijohnson@linuxfoundation.org>
---

diff --git a/releasenotes/notes/mutiple-args-logs-deploy-fce71ad1ea331ad6.yaml b/releasenotes/notes/mutiple-args-logs-deploy-fce71ad1ea331ad6.yaml
new file mode 100644
index 00000000..e3beff88
--- /dev/null
+++ b/releasenotes/notes/mutiple-args-logs-deploy-fce71ad1ea331ad6.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    The logs-deploy.sh script now allows ARCHIVE_ARTIFACTS to contain zero or
+    more files.
diff --git a/shell/logs-deploy.sh b/shell/logs-deploy.sh
index 23660d7a..f80e0b43 100644
--- a/shell/logs-deploy.sh
+++ b/shell/logs-deploy.sh
@@ -10,8 +10,9 @@
 ##############################################################################
 echo "---> logs-deploy.sh"
 
-# Ensure we fail the job if any steps fail.
-set -eu -o pipefail
+# Ensure we fail the job if any steps fail
+# Disable 'globbing'
+set -euf -o pipefail
 
 if [[ -z $"${LOGS_SERVER:-}" ]]; then
     echo "WARNING: Logging server not set"
@@ -19,19 +20,18 @@ else
     nexus_url="${NEXUSPROXY:-$NEXUS_URL}"
     nexus_path="${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}"
 
-    # Handle multiple search extensions as separate values to '-p|--pattern'
-    set -f # Disable pathname expansion
-    search_exts=()
-    IFS=' ' read -r -a search_exts <<< "${ARCHIVE_ARTIFACTS:-}"
-    pattern_opts=()
-    for search_ext in "${search_exts[@]:-}";
-    do
-        pattern_opts+=("-p" "$search_ext")
-    done
-
-    lftools deploy archives "${pattern_opts[@]}" "$nexus_url" "$nexus_path" \
-            "$WORKSPACE"
-    set +f  # Enable pathname expansion
+    if [[ -n ${ARCHIVE_ARTIFACTS:-} ]] ; then
+        # Handle multiple search extensions as separate values to '-p|--pattern'
+        # "arg1 arg2" -> (-p arg1 -p arg2)
+        pattern_opts=()
+        for arg in $ARCHIVE_ARTIFACTS; do
+            pattern_opts+=("-p" "$arg")
+        done
+        lftools deploy archives "${pattern_opts[@]}" \
+                "$nexus_url" "$nexus_path" "$WORKSPACE"
+    else
+        lftools deploy archives "$nexus_url" "$nexus_path" "$WORKSPACE"
+    fi
     lftools deploy logs "$nexus_url" "$nexus_path" "${BUILD_URL:-}"
 
     echo "Build logs: <a href=\"$LOGS_SERVER/$nexus_path\">$LOGS_SERVER/$nexus_path</a>"