X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Flogs-deploy.sh;h=23660d7af5d88701f16e7b28bb9c283e86d8114a;hb=d589c771dc75206bb2b6d592435c8316cffd29fb;hp=359642adf1eb37982a9bff6e0202750e7d2087f9;hpb=0251b7fda7266760bd82a6e56a696160822a57a0;p=releng%2Fglobal-jjb.git diff --git a/shell/logs-deploy.sh b/shell/logs-deploy.sh index 359642ad..23660d7a 100644 --- a/shell/logs-deploy.sh +++ b/shell/logs-deploy.sh @@ -13,14 +13,25 @@ echo "---> logs-deploy.sh" # Ensure we fail the job if any steps fail. set -eu -o pipefail -if [[ -z $LOGS_SERVER ]]; then +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 -p "${ARCHIVE_ARTIFACTS:-}" "$nexus_url" \ - "$nexus_path" "$WORKSPACE" + # 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"