suite: derive ceph branch automatically when using --rerun #2091
Conversation
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
kshtsk
reviewed
Oct 29, 2025
teuthology/suite/__init__.py
Outdated
Comment on lines
195
to
201
| if conf.ceph_branch is not None and conf.ceph_branch != ceph_branch: | ||
| log.warning('--ceph specified but does not match with ' | ||
| 'rerun --ceph branch: %s', | ||
| ceph_branch) | ||
| else: | ||
| log.info('Using rerun ceph branch=%s', ceph_branch) | ||
| conf.ceph_branch = ceph_branch |
Contributor
There was a problem hiding this comment.
The logic is a bit tangled, also there is case when value of --ceph is overridden (though with the same value). Also I think you still want to always print the branch out, which is currently used, don't you?. So, maybe:
if conf.ceph_branch is None:
conf.ceph_branch = ceph_branch
else:
if conf.ceph_branch != ceph_branch:
log.warning(f"--ceph specified but does not match the rerun job's branch {ceph_branch}")
log.info(f"Using ceph branch={conf.ceph_branch}")
Thoughts?
Contributor
Author
There was a problem hiding this comment.
@kshtsk yes agreed! I had discussed this with Zack as well, will ping you once I address it :)
amathuria
force-pushed
the
wip-amat-fix-rerun-branch
branch
from
ee4a9f6 to
c08e30c
Compare
amathuria
requested review from
VallariAg,
kamoltat and
kshtsk
and removed request for
a team
Contributor
Author
|
This is what a rerun would look like now: The main difference is that we are picking up the ceph branch and sha1 from the rerun configuration instead of defaulting to main : |
Using --rerun without --ceph currently defaults to the main branch. This change sources the branch from the original run being rerun, making reruns more intuitive. Warns if --ceph is specified and does not match the original branch. Fixes: https://tracker.ceph.com/issues/68872 Signed-off-by: Aishwarya Mathuria <amathuri@redhat.com>
amathuria
force-pushed
the
wip-amat-fix-rerun-branch
branch
from
c08e30c to
830fbdd
Compare
kshtsk
reviewed
Dec 10, 2025
| The suite to schedule | ||
| --wait Block until the suite is finished | ||
| -c <ceph>, --ceph <ceph> The ceph branch to run against | ||
| [default: {default_ceph_branch}] |
Contributor
There was a problem hiding this comment.
Could you please remind me why this line has been deleted? I thought, there should be just added extra comment, that in case using --rerun the branch is taken from the referred run instead.
Member
There was a problem hiding this comment.
The default being applied in docopt meant that we couldn't differentiate between "user passed --ceph main" from "user did not pass --ceph at all"
Contributor
There was a problem hiding this comment.
We had TEUTH_CEPH_BRANCH environment variable which default the --ceph when it is not provided. Still unsure if we want to keep this functionality.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Using --rerun without --ceph currently defaults to the main branch. This change sources the branch from the original run being rerun, making reruns more intuitive. Warns if --ceph is specified and does not match the original branch.