X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Flogs-deploy.sh;h=23660d7af5d88701f16e7b28bb9c283e86d8114a;hb=d589c771dc75206bb2b6d592435c8316cffd29fb;hp=222bb7f17fd252efdbc8386a79891137b23b7f89;hpb=851b0b6d0cfe84e986548fd596a9b2f18413fefd;p=releng%2Fglobal-jjb.git

diff --git a/shell/logs-deploy.sh b/shell/logs-deploy.sh
index 222bb7f1..23660d7a 100644
--- a/shell/logs-deploy.sh
+++ b/shell/logs-deploy.sh
@@ -1,5 +1,5 @@
-#!/bin/bash
-# @License EPL-1.0 <http://spdx.org/licenses/EPL-1.0>
+#!/bin/bash -l
+# SPDX-License-Identifier: EPL-1.0
 ##############################################################################
 # Copyright (c) 2017 The Linux Foundation and others.
 #
@@ -8,17 +8,31 @@
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 ##############################################################################
+echo "---> logs-deploy.sh"
 
-set -x  # Trace commands for this script to make debugging easier.
+# Ensure we fail the job if any steps fail.
+set -eu -o pipefail
 
-LOGS_SERVER="${LOGS_SERVER:-WARNING: Logging Server Not Set.}"
-NEXUS_URL="${NEXUS_URL:-$NEXUSPROXY}"
-NEXUS_PATH="${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}"
-BUILD_URL="${BUILD_URL}"
+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 "$NEXUS_URL" "$NEXUS_PATH" "$WORKSPACE"
-lftools deploy logs "$NEXUS_URL" "$NEXUS_PATH" "$BUILD_URL"
+    # 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
 
-set +x  # Disable trace since we no longer need it.
+    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>"
+    echo "Build logs: <a href=\"$LOGS_SERVER/$nexus_path\">$LOGS_SERVER/$nexus_path</a>"
+fi