From: Houa Yang <hyang@contractor.linuxfoundation.org>
Date: Thu, 9 Apr 2020 19:25:05 +0000 (-0500)
Subject: Add "logs" prefix to s3_path
X-Git-Tag: v0.53.0~5^2
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=0ff3d0986201e37719ea746468adbd2f8bdc34b1;p=releng%2Fglobal-jjb.git

Add "logs" prefix to s3_path

We are not allowed to have an index.html file at the root level of the
S3 bucket. Adding the additional prefix allows us to mirror the directory
structure of Nexus where you are able to see both production and sandbox
logs when browsing to https://logs.<project>.org/

Issue-Id: RELENG-2379, RELENG-2380
Signed-off-by: Houa Yang <hyang@contractor.linuxfoundation.org>
Change-Id: I7b6bd340170f9390c670f2b6ba507f2de1cfbc0e
---

diff --git a/releasenotes/notes/add-logs-directory-logs-deploy-c4281c9e7893f489.yaml b/releasenotes/notes/add-logs-directory-logs-deploy-c4281c9e7893f489.yaml
new file mode 100644
index 00000000..a953a6ac
--- /dev/null
+++ b/releasenotes/notes/add-logs-directory-logs-deploy-c4281c9e7893f489.yaml
@@ -0,0 +1,8 @@
+---
+features:
+  - |
+    Add "logs" prefix to s3_path("logs/$SILO/$JENKINS_HOSTNAME/$JOB_NAME/
+    $BUILD_NUMBER/"). We are not allowed to have an index.html file at the root
+    level of the S3 bucket. Adding the additional prefix allows us to mirror the
+    directory structure of Nexus where you are able to see both production and
+    sandbox logs when browsing to https://logs.<project>.org/.
diff --git a/shell/logs-deploy.sh b/shell/logs-deploy.sh
index f1b5911e..2009c327 100644
--- a/shell/logs-deploy.sh
+++ b/shell/logs-deploy.sh
@@ -45,7 +45,7 @@ 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="logs/$SILO/$JENKINS_HOSTNAME/$JOB_NAME/$BUILD_NUMBER/"
     echo "INFO: S3 path $s3_path"
 
     echo "INFO: archiving logs to S3"