Handle multiple search extension passed by JJB

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

diff --git a/shell/logs-deploy.sh b/shell/logs-deploy.sh
index 359642a..a00f0a7 100644 (file)
--- a/shell/logs-deploy.sh
+++ b/shell/logs-deploy.sh
@@ -13,14 +13,24 @@ 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}"
     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'
+    set -f # Disable pathname expansion
+    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
     lftools deploy logs "$nexus_url" "$nexus_path" "${BUILD_URL:-}"
 
     echo "Build logs: <a href=\"$LOGS_SERVER/$nexus_path\">$LOGS_SERVER/$nexus_path</a>"