X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Flogs-deploy.sh;h=44ec180ffd9ea7f151ea72f6874e7c77716694fa;hb=568b22ef45e66def2e9b3361b3d438fd5b32fd97;hp=aee1b813d1f511fa5282d28917429b814e008c23;hpb=b41e5b2b3c6d75a935a07e447005fc18eb4d1872;p=releng%2Fglobal-jjb.git

diff --git a/shell/logs-deploy.sh b/shell/logs-deploy.sh
index aee1b813..44ec180f 100644
--- a/shell/logs-deploy.sh
+++ b/shell/logs-deploy.sh
@@ -10,17 +10,32 @@
 ##############################################################################
 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"
 else
     nexus_url="${NEXUSPROXY:-$NEXUS_URL}"
     nexus_path="${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}"
+    echo "INFO: Nexus URL $nexus_url path $nexus_path"
 
-    lftools deploy archives -p "${ARCHIVE_ARTIFACTS:-}" "$nexus_url" \
-            "$nexus_path" "$WORKSPACE"
+    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
+        echo "INFO: archiving workspace using pattern(s): $ARCHIVE_ARTIFACTS"
+        lftools deploy archives "${pattern_opts[@]}" \
+                "$nexus_url" "$nexus_path" "$WORKSPACE"
+    else
+        echo "INFO: archiving workspace"
+        lftools deploy archives "$nexus_url" "$nexus_path" "$WORKSPACE"
+    fi
+    echo "INFO: archiving logs"
     lftools deploy logs "$nexus_url" "$nexus_path" "${BUILD_URL:-}"
 
     echo "Build logs: <a href=\"$LOGS_SERVER/$nexus_path\">$LOGS_SERVER/$nexus_path</a>"