Merge "Add "logs" prefix to s3_path"

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 (file)
index 0000000..a953a6a
--- /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 f1b5911..2009c32 100644 (file)
--- 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"