X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Flogs-deploy.sh;h=f4b886908af111f1264e58ba5c24bd22cf70cecf;hb=2dcdf635f5b1d7feffa3af9fe4f15368a0f1ebe7;hp=23660d7af5d88701f16e7b28bb9c283e86d8114a;hpb=d473edacae5c8da2b4da50e6d41b2a1c52316813;p=releng%2Fglobal-jjb.git diff --git a/shell/logs-deploy.sh b/shell/logs-deploy.sh index 23660d7a..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" @@ -20,18 +21,13 @@ else 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:-}" + # "arg1 arg2" -> (-p arg1 -p arg2) pattern_opts=() - for search_ext in "${search_exts[@]:-}"; - do - pattern_opts+=("-p" "$search_ext") + for arg in ${ARCHIVE_ARTIFACTS:-}; do + pattern_opts+=("-p" "$arg") 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"