Pass multiple pattern args in logs-deploy.sh

[releng/global-jjb.git] / shell / logs-deploy.sh

diff --git a/shell/logs-deploy.sh b/shell/logs-deploy.sh
index aee1b81..f4b8869 100644 (file)
--- 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,8 +20,14 @@ else
     nexus_url="${NEXUSPROXY:-$NEXUS_URL}"
     nexus_path="${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}"
 
-    lftools deploy archives -p "${ARCHIVE_ARTIFACTS:-}" "$nexus_url" \
-            "$nexus_path" "$WORKSPACE"
+    # 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"
     lftools deploy logs "$nexus_url" "$nexus_path" "${BUILD_URL:-}"
 
     echo "Build logs: <a href=\"$LOGS_SERVER/$nexus_path\">$LOGS_SERVER/$nexus_path</a>"