X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Flogs-deploy.sh;h=359642adf1eb37982a9bff6e0202750e7d2087f9;hb=refs%2Fchanges%2F56%2F15556%2F3;hp=7b656930347e1da559503fb7c230beaeaf9a0fec;hpb=6df0d5a717c1e3c33aae618b80382b491476cd54;p=releng%2Fglobal-jjb.git
diff --git a/shell/logs-deploy.sh b/shell/logs-deploy.sh
index 7b656930..359642ad 100644
--- a/shell/logs-deploy.sh
+++ b/shell/logs-deploy.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
# SPDX-License-Identifier: EPL-1.0
##############################################################################
# Copyright (c) 2017 The Linux Foundation and others.
@@ -13,25 +13,15 @@ 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' ]
-then
- set +x # Disable trace since we no longer need it
-
+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}"
- BUILD_URL="${BUILD_URL}"
-
- lftools deploy archives -p "$ARCHIVE_ARTIFACTS" "$NEXUS_URL" "$NEXUS_PATH" "$WORKSPACE"
- lftools deploy logs "$NEXUS_URL" "$NEXUS_PATH" "$BUILD_URL"
+ nexus_url="${NEXUSPROXY:-$NEXUS_URL}"
+ nexus_path="${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}"
- set +x # Disable trace since we no longer need it.
+ lftools deploy archives -p "${ARCHIVE_ARTIFACTS:-}" "$nexus_url" \
+ "$nexus_path" "$WORKSPACE"
+ lftools deploy logs "$nexus_url" "$nexus_path" "${BUILD_URL:-}"
- echo "Build logs: $LOGS_SERVER/$NEXUS_PATH"
+ echo "Build logs: $LOGS_SERVER/$nexus_path"
fi