ceph-dev-pipeline: Validate given BRANCH param against derived BRANCH - #2585
Open
djgalloway wants to merge 2 commits into
Open
ceph-dev-pipeline: Validate given BRANCH param against derived BRANCH#2585djgalloway wants to merge 2 commits into
djgalloway wants to merge 2 commits into
Conversation
Handles an unlikely edge case but handled nonetheless. This could be problematic if, for example,
a user triggered ceph-dev-pipeline by specifying::
SHA1=1234abcd
BRANCH=main
But that SHA1 actually belongs to a wip branch. Now both chacra and shaman think the tip of main
is 1234abcd.
Fixes: https://tracker.ceph.com/issues/73658
Signed-off-by: David Galloway <david.galloway@ibm.com>
djgalloway
force-pushed
the
wip-73658
branch
3 times, most recently
from
July 16, 2026 13:57
4a0c506 to
46c099b
Compare
When SHA1 is provided, the checkout prefers it over BRANCH, but dist/branch echoed the BRANCH parameter verbatim. If the two disagreed, downstream consumers of dist/branch (ceph-dev-pipeline and, through it, chacra/shaman) would record the build under the wrong ref. The checkout already fetched every branch head into refs/remotes/origin, so look up which branches tip the built commit and reset BRANCH accordingly. The given BRANCH is kept when it already tips the commit (including when several branches share the tip) and, with a warning, when the commit is not the tip of any branch, since older commits are contained by many branches and there is no unambiguous answer. Fixes: https://tracker.ceph.com/issues/73658 Signed-off-by: David Galloway <david.galloway@ibm.com>
Contributor
Author
|
Works |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Handles an unlikely edge case but handled nonetheless. This could be problematic if, for example, a user triggered ceph-dev-pipeline by specifying::
But that SHA1 actually belongs to a wip branch. Now both chacra and shaman think the tip of main is 1234abcd.
Fixes: https://tracker.ceph.com/issues/73658