X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Flogs-deploy.sh;h=f4b886908af111f1264e58ba5c24bd22cf70cecf;hb=2dcdf635f5b1d7feffa3af9fe4f15368a0f1ebe7;hp=aee1b813d1f511fa5282d28917429b814e008c23;hpb=b41e5b2b3c6d75a935a07e447005fc18eb4d1872;p=releng%2Fglobal-jjb.git diff --git a/shell/logs-deploy.sh b/shell/logs-deploy.sh index aee1b813..f4b88690 100644 --- 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: $LOGS_SERVER/$nexus_path"