Skip to content

qa/tasks/cephadm: add support for distro-suffix#66171

Merged
batrick merged 1 commit intoceph:mainfrom
athanatos:sjust/wip-cephadm-container
Jan 28, 2026
Merged

qa/tasks/cephadm: add support for distro-suffix#66171
batrick merged 1 commit intoceph:mainfrom
athanatos:sjust/wip-cephadm-container

Conversation

@athanatos
Copy link
Contributor

Show available Jenkins commands

You must only issue one Jenkins command per-comment. Jenkins does not understand
comments with more than one command.

Signed-off-by: Samuel Just <sjust@redhat.com>
Comment on lines +1977 to +1980
if distro_suffix is not None:
ctx.ceph[cluster_name].image += '-' + distro_suffix
if flavor == "crimson-debug" or flavor == "crimson-release":
ctx.ceph[cluster_name].image += '-' + flavor
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Generally looks OK to me. I am just curious if anyone else has any opinions on being able to (easily) split the tag into parts, in that case joining with a - conflicts a little with crimson-release. Should we consider joining the tag with dots . or + instead?

@athanatos athanatos marked this pull request as ready for review November 12, 2025 17:10
@athanatos athanatos requested a review from a team as a code owner November 12, 2025 17:10
Copy link
Contributor

@adk3798 adk3798 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, although I do agree with John's point that we might want to consider a different character as a splitter

@athanatos
Copy link
Contributor Author

@phlogistonjohn Honestly, I don't have an opinion. I'd like to merge this one now as we need it to test cephadm, but I'm perfectly happy to change it now or in a future PR if you pick a different delimiter. Just let me know.

@dmick
Copy link
Member

dmick commented Nov 12, 2025

Have just been in this up to my ears with repairing the quay-pruner job (ceph/ceph-build#2496) and I don't have strong opinions other than to say we'll need to touch a lot of places if we change conventions on tags. Maybe we should, but there are lots of places to touch. So far I've been using either my human brain (such as it is) or tricksy REs to do the job and it hasn't been horrible.

@phlogistonjohn
Copy link
Contributor

I pinged in the build sig channel, to see if anyone cares, but if you don't hear back in 12hrs just assume it's fine.

@batrick
Copy link
Member

batrick commented Nov 17, 2025

I pinged in the build sig channel, to see if anyone cares, but if you don't hear back in 12hrs just assume it's fine.

It's fine then?

@batrick
Copy link
Member

batrick commented Nov 17, 2025

This PR is under test in https://tracker.ceph.com/issues/73883.

@batrick
Copy link
Member

batrick commented Nov 17, 2025

This PR is under test in https://tracker.ceph.com/issues/73884.

@phlogistonjohn
Copy link
Contributor

Yup, it's fine.

@batrick
Copy link
Member

batrick commented Nov 17, 2025

This PR is under test in https://tracker.ceph.com/issues/73885.

@batrick
Copy link
Member

batrick commented Nov 17, 2025

This PR is under test in https://tracker.ceph.com/issues/73888.

@batrick
Copy link
Member

batrick commented Nov 17, 2025

This PR is under test in https://tracker.ceph.com/issues/73889.

batrick added a commit to batrick/ceph that referenced this pull request Nov 18, 2025
* refs/pull/66171/head:
	qa/tasks/cephadm: add support for distro-suffix
@batrick
Copy link
Member

batrick commented Dec 9, 2025

This PR is under test in https://tracker.ceph.com/issues/74161.

@batrick batrick merged commit 5222c11 into ceph:main Jan 28, 2026
13 of 14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants