X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Flogs-deploy.sh;h=633aae86eeff5949a6ab6c1356b11a1c9a93eba5;hb=b55451a53da28d40c62de5cae462302a32fe4c31;hp=6dc80285e5cddaf0f90bd881b3eb2f289af11939;hpb=07b824c8f9cbfad2bdcf8c4de02cbe0a2583d6f5;p=releng%2Fglobal-jjb.git

diff --git a/shell/logs-deploy.sh b/shell/logs-deploy.sh
index 6dc80285..633aae86 100644
--- 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.
 #
@@ -10,28 +10,50 @@
 ##############################################################################
 echo "---> logs-deploy.sh"
 
-# Ensure we fail the job if any steps fail.
-set -eu -o pipefail
+# Ensure we fail the job if any steps fail
+# Disable 'globbing'
+set -euf -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
-
-    echo "WARNING: Logging server not set"
+if [[ -z ${LOGS_SERVER:-} ]]; then
+    echo "WARNING: Nexus logging server not set"
 else
-    NEXUS_URL="${NEXUS_URL:-$NEXUSPROXY}"
-    NEXUS_PATH="${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}"
-    BUILD_URL="${BUILD_URL}"
+    nexus_url="${NEXUSPROXY:-$NEXUS_URL}"
+    nexus_path="${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}"
+    echo "INFO: Nexus URL $nexus_url path $nexus_path"
+
+    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
+        echo "INFO: archiving workspace using pattern(s): $ARCHIVE_ARTIFACTS"
+        lftools deploy archives "${pattern_opts[@]}" \
+                "$nexus_url" "$nexus_path" "$WORKSPACE"
+    else
+        echo "INFO: archiving workspace"
+        lftools deploy archives "$nexus_url" "$nexus_path" "$WORKSPACE"
+    fi
+    echo "INFO: archiving logs"
+    lftools deploy logs "$nexus_url" "$nexus_path" "${BUILD_URL:-}"
+
+    echo "Build logs: <a href=\"$LOGS_SERVER/$nexus_path\">$LOGS_SERVER/$nexus_path</a>"
+fi
 
-    lftools deploy archives -p "$ARCHIVE_ARTIFACTS" "$NEXUS_URL" "$NEXUS_PATH" "$WORKSPACE"
-    lftools deploy logs "$NEXUS_URL" "$NEXUS_PATH" "$BUILD_URL"
+if [[ -z ${S3_BUCKET:-} ]]; then
+    echo "WARNING: S3 logging server not set"
+else
+    s3_path="$SILO/$JENKINS_HOSTNAME/$JOB_NAME/$BUILD_NUMBER"
+    echo "INFO: S3 path $s3_path"
 
-    set +x  # Disable trace since we no longer need it.
+    pattern_opts=()
+    for arg in $ARCHIVE_ARTIFACTS; do
+        pattern_opts+=("-p" "$arg")
+    done
+    lftools deploy s3 "${pattern_opts[@]}" "$S3_BUCKET" "$s3_path" \
+        "$BUILD_URL" "$WORKSPACE"
 
-    echo "Build logs: <a href=\"$LOGS_SERVER/$NEXUS_PATH\">$LOGS_SERVER/$NEXUS_PATH</a>"
+    echo "Build logs: <a href=\"https://$S3_BUCKET.s3.amazonaws.com/$s3_path\"></a>"
 fi
+