X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;ds=sidebyside;f=shell%2Flogs-deploy.sh;h=23660d7af5d88701f16e7b28bb9c283e86d8114a;hb=6329c452fdc99013dd7539acfe5b7252163fc554;hp=8756f72d260a6fdce0197fb76b0ec2e8e594cf2a;hpb=a99cfe8b7c3e3b33cf9f210a90c50ea65128b30e;p=releng%2Fglobal-jjb.git
diff --git a/shell/logs-deploy.sh b/shell/logs-deploy.sh
index 8756f72d..23660d7a 100644
--- a/shell/logs-deploy.sh
+++ b/shell/logs-deploy.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
# SPDX-License-Identifier: EPL-1.0
##############################################################################
# Copyright (c) 2017 The Linux Foundation and others.
@@ -13,25 +13,26 @@ echo "---> logs-deploy.sh"
# Ensure we fail the job if any steps fail.
set -eu -o pipefail
-set -x # Trace commands for this script to make debugging easier.
-
-ARCHIVE_ARTIFACTS="${ARCHIVE_ARTIFACTS:-}"
-LOGS_SERVER="${LOGS_SERVER:-None}"
-
-if [ "${LOGS_SERVER}" == 'None' ]
-then
- set +x # Disable trace since we no longer need it
-
+if [[ -z $"${LOGS_SERVER:-}" ]]; then
echo "WARNING: Logging server not set"
else
- NEXUS_URL="${NEXUS_URL:-$NEXUSPROXY}"
- NEXUS_PATH="${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}"
- BUILD_URL="${BUILD_URL}"
-
- lftools deploy archives -p "$ARCHIVE_ARTIFACTS" "$NEXUS_URL" "$NEXUS_PATH" "$WORKSPACE"
- lftools deploy logs "$NEXUS_URL" "$NEXUS_PATH" "$BUILD_URL"
-
- set +x # Disable trace since we no longer need it.
-
- echo "Build logs: $LOGS_SERVER/$NEXUS_PATH"
+ 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
+ lftools deploy logs "$nexus_url" "$nexus_path" "${BUILD_URL:-}"
+
+ echo "Build logs: $LOGS_SERVER/$nexus_path"
fi