X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;ds=sidebyside;f=shell%2Flogs-deploy.sh;h=f80e0b437e809cd3ea474df51f87e2698d1199e4;hb=refs%2Fchanges%2F18%2F62318%2F2;hp=114692e96d8d2c2d5abc521f13f5bd7b9a2d53f0;hpb=d87ce091fe93fff99e25343a69baaa26c186ca85;p=releng%2Fglobal-jjb.git
diff --git a/shell/logs-deploy.sh b/shell/logs-deploy.sh
index 114692e9..f80e0b43 100644
--- a/shell/logs-deploy.sh
+++ b/shell/logs-deploy.sh
@@ -10,28 +10,29 @@
##############################################################################
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
+# Ensure we fail the job if any steps fail
+# Disable 'globbing'
+set -euf -o pipefail
+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"
-
- set +x # Disable trace since we no longer need it.
-
- echo "Build logs: $LOGS_SERVER/$NEXUS_PATH"
+ nexus_url="${NEXUSPROXY:-$NEXUS_URL}"
+ nexus_path="${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}"
+
+ if [[ -n ${ARCHIVE_ARTIFACTS:-} ]] ; then
+ # Handle multiple search extensions as separate values to '-p|--pattern'
+ # "arg1 arg2" -> (-p arg1 -p arg2)
+ pattern_opts=()
+ for arg in $ARCHIVE_ARTIFACTS; do
+ pattern_opts+=("-p" "$arg")
+ done
+ lftools deploy archives "${pattern_opts[@]}" \
+ "$nexus_url" "$nexus_path" "$WORKSPACE"
+ else
+ lftools deploy archives "$nexus_url" "$nexus_path" "$WORKSPACE"
+ fi
+ lftools deploy logs "$nexus_url" "$nexus_path" "${BUILD_URL:-}"
+
+ echo "Build logs: $LOGS_SERVER/$nexus_path"
fi