X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Flogs-deploy.sh;h=7b656930347e1da559503fb7c230beaeaf9a0fec;hb=6eefde1f463638b5021c2ec96eb67a017d379f1f;hp=fa31f2bcf97f192cfad373a1a42c0e56cb93ac7e;hpb=0cd4f5d8c5fc52e167cd19ab00bddec4f7f0c190;p=releng%2Fglobal-jjb.git diff --git a/shell/logs-deploy.sh b/shell/logs-deploy.sh index fa31f2bc..7b656930 100644 --- a/shell/logs-deploy.sh +++ b/shell/logs-deploy.sh @@ -1,5 +1,5 @@ #!/bin/bash -# @License EPL-1.0 +# SPDX-License-Identifier: EPL-1.0 ############################################################################## # Copyright (c) 2017 The Linux Foundation and others. # @@ -15,6 +15,7 @@ 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' ] @@ -23,11 +24,11 @@ then echo "WARNING: Logging server not set" else - NEXUS_URL="${NEXUS_URL:-$NEXUSPROXY}" + NEXUS_URL="${NEXUSPROXY:-$NEXUS_URL}" NEXUS_PATH="${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}" BUILD_URL="${BUILD_URL}" - lftools deploy archives "$NEXUS_URL" "$NEXUS_PATH" "$WORKSPACE" + 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.