From 65355178549468b165f8106641c96c3190b1d843 Mon Sep 17 00:00:00 2001
From: Anil Belur <abelur@linuxfoundation.org>
Date: Mon, 8 Aug 2022 09:50:23 +1000
Subject: [PATCH] Fix: Add S3 URL in href to ship logs
The href must be set correctly for the description
setting plugin to work with AWS S3.
Issue-ID: RELENG-4354
Change-Id: Ia388fd7de37cef4db0d43de057d2bab914eec2b6
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
---
releasenotes/notes/fix-s3-URL-desc-setter-ca99d85d3d860cc5.yaml | 5 +++++
vars/lfInfraShipLogs.groovy | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
create mode 100644 releasenotes/notes/fix-s3-URL-desc-setter-ca99d85d3d860cc5.yaml
diff --git a/releasenotes/notes/fix-s3-URL-desc-setter-ca99d85d3d860cc5.yaml b/releasenotes/notes/fix-s3-URL-desc-setter-ca99d85d3d860cc5.yaml
new file mode 100644
index 0000000..b1b7be7
--- /dev/null
+++ b/releasenotes/notes/fix-s3-URL-desc-setter-ca99d85d3d860cc5.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+ - |
+ Add S3 URL in href as required to display the AWS S3 logs
+ from the jobs description.
diff --git a/vars/lfInfraShipLogs.groovy b/vars/lfInfraShipLogs.groovy
index f9b237e..67876f0 100644
--- a/vars/lfInfraShipLogs.groovy
+++ b/vars/lfInfraShipLogs.groovy
@@ -74,7 +74,7 @@ def call(body) {
sh(script: libraryResource('shell/logs-deploy.sh'))
}
s3_path = "logs/${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}/"
- buildDesc += "S3 build logs: <a href=\"https://$CDN_URL/$s3_path\"></a>\n"
+ buildDesc += "S3 build logs: <a href=\"https://$CDN_URL/$s3_path\">https://$CDN_URL/$s3_path</a>\n"
// If LOGS_SERVER is also defined, logs-deploy.sh will deploy to both
if ("$LOGS_SERVER" != "") {
nexus_path = "${SILO}/${JENKINS_HOSTNAME}/${JOB_NAME}/${BUILD_NUMBER}"
--
2.16.6