From 55656a479577984c8987fb5bb9ee9ffe10e025de Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Mon, 23 Oct 2023 17:11:50 +0200 Subject: [PATCH] Be sure that we use a final / in S3_UPLOAD_PATH Signed-off-by: Jose Luis Rivero --- jenkins-scripts/dsl/_configs_/Globals.groovy | 2 +- jenkins-scripts/lib/repository_uploader.bash | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jenkins-scripts/dsl/_configs_/Globals.groovy b/jenkins-scripts/dsl/_configs_/Globals.groovy index 3da1e8c38..7de2b82e8 100644 --- a/jenkins-scripts/dsl/_configs_/Globals.groovy +++ b/jenkins-scripts/dsl/_configs_/Globals.groovy @@ -137,7 +137,7 @@ class Globals } static String s3_releases_dir(String package_name) { - return get_canonical_package_name(package_name) + '/releases' + return get_canonical_package_name(package_name) + '/releases/' } static String s3_upload_tarball_path(String package_name) { diff --git a/jenkins-scripts/lib/repository_uploader.bash b/jenkins-scripts/lib/repository_uploader.bash index f45ee35b8..5e0a8949e 100644 --- a/jenkins-scripts/lib/repository_uploader.bash +++ b/jenkins-scripts/lib/repository_uploader.bash @@ -144,7 +144,7 @@ for pkg in ${S3_FILES_TO_UPLOAD}; do fi # Seems important to upload the path with a final slash - S3_upload "${pkgs_path}/${pkg}" "${S3_UPLOAD_PATH}" + S3_upload "${pkgs_path}/${pkg}" "${S3_UPLOAD_PATH%%*(/)}/" done # .bottle | brew binaries