Be sure that we use a final / in S3_UPLOAD_PATH

Signed-off-by: Jose Luis Rivero <[email protected]>
gazebo-tooling · Oct 24, 2023 · 55656a4 · 55656a4
1 parent c2433a5
commit 55656a4
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/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