From 0ff3d0986201e37719ea746468adbd2f8bdc34b1 Mon Sep 17 00:00:00 2001 From: Houa Yang Date: Thu, 9 Apr 2020 14:25:05 -0500 Subject: [PATCH] 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..org/ Issue-Id: RELENG-2379, RELENG-2380 Signed-off-by: Houa Yang Change-Id: I7b6bd340170f9390c670f2b6ba507f2de1cfbc0e --- .../notes/add-logs-directory-logs-deploy-c4281c9e7893f489.yaml | 8 ++++++++ shell/logs-deploy.sh | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/add-logs-directory-logs-deploy-c4281c9e7893f489.yaml 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..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" -- 2.16.6