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 2 commits into
base: main
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2d1263
ceph-dev-pipeline: Validate given BRANCH param against derived BRANCH
djgalloway May 15, 2026
3696270
ceph-source-dist: derive canonical BRANCH from SHA1
djgalloway Jul 16, 2026
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
16 changes: 10 additions & 6 deletions ceph-dev-pipeline/build/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ def doSourceDistribution() {

// Stage 4 (copy artifacts): copy artifacts from the setup job, verify SHA1, set VERSION/build description, and extract the source tarball.
def doCopyArtifactsStage() {
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 @@ -198,6 +198,10 @@ def doCopyArtifactsStage() {
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: "${env.WORKSPACE}/dist/branch"
env.BRANCH = branch_props.BRANCH.trim()
env.VERSION = readFile(file: "${env.WORKSPACE}/dist/version").trim()
// In a release build, dist/other_envvars contains CEPH_REPO, and chacra_url
// as written during ceph-source-dist but we don't to be able to define
Expand All @@ -209,11 +213,11 @@ def doCopyArtifactsStage() {
def branch_ui_value = env.BRANCH
def sha1_ui_value = env.SHA1
if (env.CEPH_REPO?.find(/https?:\/\/github.com\//)) {
// If this is a release build, link to ceph-release.git's $BRANCH-release branch
def suffix = (env.RELEASE_BUILD?.trim() == "true") ? "-release" : ""

def branch_url = "${env.CEPH_REPO}/tree/${env.BRANCH}${suffix}"
branch_ui_value = "<a href=\"${branch_url}\">${env.BRANCH}${suffix}</a>"
// In a release build, env.BRANCH already carries the -release suffix
// (derived from dist/branch above), so the link points at
// ceph-releases.git's $BRANCH-release branch without appending it here.
def branch_url = "${env.CEPH_REPO}/tree/${env.BRANCH}"
branch_ui_value = "<a href=\"${branch_url}\">${env.BRANCH}</a>"
def commit_url = "${env.CEPH_REPO}/commit/${env.SHA1}"
sha1_ui_value = "<a href=\"${commit_url}\">${env.SHA1}</a>"
}
Expand Down
15 changes: 15 additions & 0 deletions ceph-source-dist/build/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,21 @@ pipeline {
bzip2 -dc ceph-$ceph_version_tarball.$extension | gzip > ceph-$ceph_version_tarball.tar.gz
popd
else
if [ -n "${SHA1:-}" ]; then
# The checkout preferred SHA1 over BRANCH, so the BRANCH
# parameter may not match the code actually built
# (https://tracker.ceph.com/issues/73658). The fetch put every
# branch head in refs/remotes/origin, so list the branches whose
# tip is the built commit (HEAD) and keep BRANCH only if it is
# one of them.
mapfile -t tip_branches < <(git for-each-ref --points-at HEAD --format='%(refname:strip=3)' refs/remotes/origin)
if [ "${#tip_branches[@]}" -eq 0 ]; then
echo "WARNING: $(git rev-parse HEAD) is not the tip of any branch; keeping BRANCH=${BRANCH}"
elif ! printf '%s\n' "${tip_branches[@]}" | grep -qxF "${BRANCH}"; then
echo "BRANCH=${BRANCH} does not point at SHA1=$(git rev-parse HEAD); using ${tip_branches[0]}"
BRANCH="${tip_branches[0]}"
fi
fi
echo "BRANCH=${BRANCH}" > dist/branch
fi

Expand Down