Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improvements in the releasing pipeline #1045

Merged
merged 3 commits into from
Oct 24, 2023
Merged

Improvements in the releasing pipeline #1045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
171ab97
Be sure that we use a final / in S3_UPLOAD_PATH
j-rivero Oct 23, 2023
a04482e
Make OSRFRelease to fail if release.py fails
j-rivero Oct 23, 2023
86214e2
Patch S3_UPLOAD_PATH and leave the releases_dir without final /
j-rivero Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion jenkins-scripts/dsl/_configs_/OSRFReleasepy.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class OSRFReleasepy
python3 ./scripts/release.py \${dry_run_str} "\${PACKAGE}" "\${VERSION}" "\${PASS}" \${extra_osrf_repo} \
--source-tarball-uri \${SOURCE_TARBALL_URI} \
--release-repo-branch \${RELEASE_REPO_BRANCH} \
--upload-to-repo \${UPLOAD_TO_REPO} > log || echo "MARK_AS_UNSTABLE"
--upload-to-repo \${UPLOAD_TO_REPO} > log
echo " - done"
""".stripIndent())
}
Expand Down
2 changes: 1 addition & 1 deletion jenkins-scripts/dsl/_configs_/OSRFSourceCreation.groovy
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion jenkins-scripts/lib/repository_uploader.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down