Skip to content

Commit

Permalink
Patch S3_UPLOAD_PATH and leave the releases_dir without final /
Browse files Browse the repository at this point in the history
Signed-off-by: Jose Luis Rivero <[email protected]>
  • Loading branch information
j-rivero committed Oct 23, 2023
1 parent a04482e commit 86214e2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion jenkins-scripts/dsl/_configs_/Globals.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion jenkins-scripts/dsl/_configs_/OSRFSourceCreation.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down

0 comments on commit 86214e2

Please sign in to comment.