From 9c5ad135b37ccb1799bca60c2dab96735c4bfd84 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Mon, 23 Oct 2023 19:18:03 +0200 Subject: [PATCH] Patch S3_UPLOAD_PATH and leave the releases_dir without final / Signed-off-by: Jose Luis Rivero --- jenkins-scripts/dsl/_configs_/Globals.groovy | 2 +- jenkins-scripts/dsl/_configs_/OSRFSourceCreation.groovy | 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 7de2b82e8..3da1e8c38 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/dsl/_configs_/OSRFSourceCreation.groovy b/jenkins-scripts/dsl/_configs_/OSRFSourceCreation.groovy index 4e61ca7d9..6297244df 100644 --- a/jenkins-scripts/dsl/_configs_/OSRFSourceCreation.groovy +++ b/jenkins-scripts/dsl/_configs_/OSRFSourceCreation.groovy @@ -136,7 +136,7 @@ class OSRFSourceCreation parameters { currentBuild() predefinedProps([PROJECT_NAME_TO_COPY_ARTIFACTS: '${JOB_NAME}', - S3_UPLOAD_PATH: Globals.s3_releases_dir(package_name)]) // relative path + S3_UPLOAD_PATH: "${Globals.s3_releases_dir(package_name)}/"]) // relative path with a final / propertiesFile(properties_file) // S3_FILES_TO_UPLOAD } }