From bada38f80d4db15240dc56ff69a738ba396066df Mon Sep 17 00:00:00 2001
From: Houa Yang <hyang@contractor.linuxfoundation.org>
Date: Wed, 4 Mar 2020 18:53:41 -0600
Subject: [PATCH] Update logs-deploy.sh

Update script with get_pattern_opts function. Function refactors code to
be reusable.

Signed-off-by: Houa Yang <hyang@contractor.linuxfoundation.org>
Change-Id: Ic5366f2177c401ce3bedda67b03fc5dee288cb8f
---
 shell/logs-deploy.sh | 38 +++++++++++++++++---------------------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/shell/logs-deploy.sh b/shell/logs-deploy.sh
index 633aae86..5c0956d9 100644
--- a/shell/logs-deploy.sh
+++ b/shell/logs-deploy.sh
@@ -14,6 +14,17 @@ echo "---> logs-deploy.sh"
 # Disable 'globbing'
 set -euf -o pipefail
 
+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
@@ -21,20 +32,9 @@ else
     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 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:-}"
 
@@ -44,16 +44,12 @@ fi
 if [[ -z ${S3_BUCKET:-} ]]; then
     echo "WARNING: S3 logging server not set"
 else
-    s3_path="$SILO/$JENKINS_HOSTNAME/$JOB_NAME/$BUILD_NUMBER"
+    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" \
+    lftools deploy s3 ${pattern_opts:+"$pattern_opts"} "$S3_BUCKET" "$s3_path" \
         "$BUILD_URL" "$WORKSPACE"
 
-    echo "Build logs: <a href=\"https://$S3_BUCKET.s3.amazonaws.com/$s3_path\"></a>"
+    echo "Build logs: <a href=\"https://$CDN_URL/$s3_path\"></a>"
 fi
 
-- 
2.16.6