Update logs-deploy.sh

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

diff --git a/shell/logs-deploy.sh b/shell/logs-deploy.sh
index f4b8869..5c0956d 100644 (file)
--- a/shell/logs-deploy.sh
+++ b/shell/logs-deploy.sh
@@ -14,21 +14,42 @@ echo "---> logs-deploy.sh"
 # Disable 'globbing'
 set -euf -o pipefail
 
-if [[ -z $"${LOGS_SERVER:-}" ]]; then
-    echo "WARNING: Logging server not set"
+function get_pattern_opts()
+{
+    opts=()
+    for arg in ${ARCHIVE_ARTIFACTS:-}; do
+        opts+=("-p" "$arg)")
+    done
+    echo "${opts[@]-}"
+}
+
+pattern_opts="$(get_pattern_opts)"
+
+if [[ -z ${LOGS_SERVER:-} ]]; then
+    echo "WARNING: Nexus logging server not set"
 else
     nexus_url="${NEXUSPROXY:-$NEXUS_URL}"
     nexus_path="${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}"
+    echo "INFO: Nexus URL $nexus_url path $nexus_path"
 
-    # 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"
+    echo "INFO: archiving workspace using pattern(s): $ARCHIVE_ARTIFACTS"
+    lftools deploy archives ${pattern_opts:+"$pattern_opts"} "$nexus_url" "$nexus_path" "$WORKSPACE"
+
+    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
+
+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"
+
+    lftools deploy s3 ${pattern_opts:+"$pattern_opts"} "$S3_BUCKET" "$s3_path" \
+        "$BUILD_URL" "$WORKSPACE"
+
+    echo "Build logs: <a href=\"https://$CDN_URL/$s3_path\"></a>"
+fi
+