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

diff --git a/shell/logs-deploy.sh b/shell/logs-deploy.sh
index f4b88690..633aae86 100644
--- a/shell/logs-deploy.sh
+++ b/shell/logs-deploy.sh
@@ -14,21 +14,46 @@ 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'
+        # "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
+
+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"
 
-    # Handle multiple search extensions as separate values to '-p|--pattern'
-    # "arg1 arg2" -> (-p arg1 -p arg2)
     pattern_opts=()
-    for arg in ${ARCHIVE_ARTIFACTS:-}; do
+    for arg in $ARCHIVE_ARTIFACTS; do
         pattern_opts+=("-p" "$arg")
     done
-    lftools deploy archives "${pattern_opts[@]}" "$nexus_url" "$nexus_path" \
-            "$WORKSPACE"
-    lftools deploy logs "$nexus_url" "$nexus_path" "${BUILD_URL:-}"
+    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
+