Make sure that jjb-cleanup.sh allows unbound vars

[releng/global-jjb.git] / shell / logs-deploy.sh

diff --git a/shell/logs-deploy.sh b/shell/logs-deploy.sh
index fa31f2b..114692e 100644 (file)
--- a/shell/logs-deploy.sh
+++ b/shell/logs-deploy.sh
@@ -1,5 +1,5 @@
-#!/bin/bash
-# @License EPL-1.0 <http://spdx.org/licenses/EPL-1.0>
+#!/bin/bash -l
+# 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.