Merge "Add templates Tox + SonarQube Jenkins plugin"

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

diff --git a/shell/logs-deploy.sh b/shell/logs-deploy.sh
index f80e0b4..633aae8 100644 (file)
--- a/shell/logs-deploy.sh
+++ b/shell/logs-deploy.sh
@@ -14,11 +14,12 @@ echo "---> logs-deploy.sh"
 # Disable 'globbing'
 set -euf -o pipefail
 
-if [[ -z $"${LOGS_SERVER:-}" ]]; then
-    echo "WARNING: Logging server not set"
+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"
 
     if [[ -n ${ARCHIVE_ARTIFACTS:-} ]] ; then
         # Handle multiple search extensions as separate values to '-p|--pattern'
@@ -27,12 +28,32 @@ else
         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
+
+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"
+
+    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=\"https://$S3_BUCKET.s3.amazonaws.com/$s3_path\"></a>"
+fi
+