Skip to content

ceph-dev-pipeline: Validate given BRANCH param against derived BRANCH #2585

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

Open
djgalloway wants to merge 1 commit into
base: main
Choose a base branch
from
Open

ceph-dev-pipeline: Validate given BRANCH param against derived BRANCH #2585

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion ceph-dev-pipeline/build/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ pipeline {
stage("copy artifacts") {
steps {
script {
def artifact_filter = "dist/sha1,dist/version,dist/other_envvars,dist/ceph-*.tar.bz2"
def artifact_filter = "dist/sha1,dist/version,dist/branch,dist/other_envvars,dist/ceph-*.tar.bz2"
def os = get_os_info(env.DIST)
if ( env.CI_COMPILE && os.pkg_type == "deb" ) {
artifact_filter += ",dist/ceph_*.diff.gz,dist/ceph_*.dsc"
Expand All @@ -276,6 +276,10 @@ pipeline {
env.SHA1 = sha1_from_artifact
}
println "SHA1=${sha1_trimmed}"
// Derive canonical BRANCH from artifact.
// This way, if SHA1 and BRANCH were both provided as params and BRANCH didn't match, it will now.
def branch_props = readProperties file: "${WORKSPACE}/dist/branch"
env.BRANCH = branch_props.BRANCH.trim()
env.VERSION = readFile(file: "${WORKSPACE}/dist/version").trim()
script {
// In a release build, dist/other_envvars contains CEPH_REPO, and chacra_url
Expand Down