Patch S3_UPLOAD_PATH and leave the releases_dir without final /

Signed-off-by: Jose Luis Rivero <[email protected]>
gazebo-tooling · Oct 24, 2023 · 9c5ad13 · 9c5ad13
1 parent defef68
commit 9c5ad13
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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
                     }
                   }