X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Flogs-deploy.sh;h=7b656930347e1da559503fb7c230beaeaf9a0fec;hb=c3150dcea8069e284ec52bf487541576a62687ab;hp=e5c990a46ae848ca7bd9fe9c8ac12f3b20d5b62b;hpb=5df83713c9a978e7a4d1d65ce9377a8ffbf525d0;p=releng%2Fglobal-jjb.git diff --git a/shell/logs-deploy.sh b/shell/logs-deploy.sh index e5c990a4..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. # @@ -8,9 +8,14 @@ # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-v10.html ############################################################################## +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' ] @@ -19,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.