tentacle kickoff v2 by batrick · Pull Request #62089 · ceph/ceph

batrick · 2025-03-03T14:23:02Z

Handling some post-kickoff checks.

Contribution Guidelines

To sign and title your commits, please refer to Submitting Patches to Ceph.
If you are submitting a fix for a stable branch (e.g. "quincy"), please refer to Submitting Patches to Ceph - Backports for the proper workflow.
When filling out the below checklist, you may click boxes directly in the GitHub web UI. When entering or editing the entire PR message in the GitHub web UI editor, you may also select a checklist item by adding an x between the brackets: [x]. Spaces and capitalization matter when checking off items this way.

Checklist

Tracker (select at least one)
- References tracker ticket
- Very recent bug; references commit where it was introduced
- New feature (ticket optional)
- Doc update (no ticket needed)
- Code cleanup (no ticket needed)
Component impact
- Affects Dashboard, opened tracker ticket
- Affects Orchestrator, opened tracker ticket
- No impact that needs to be tracked
Documentation (select at least one)
- Updates relevant documentation
- No doc update is appropriate
Tests (select at least one)
- Includes unit test(s)
- Includes integration test(s)
- Includes bug reproducer
- No tests

Show available Jenkins commands

jenkins test classic perf Jenkins Job | Jenkins Job Definition
jenkins test crimson perf Jenkins Job | Jenkins Job Definition
jenkins test signed Jenkins Job | Jenkins Job Definition
jenkins test make check Jenkins Job | Jenkins Job Definition
jenkins test make check arm64 Jenkins Job | Jenkins Job Definition
jenkins test submodules Jenkins Job | Jenkins Job Definition
jenkins test dashboard Jenkins Job | Jenkins Job Definition
jenkins test dashboard cephadm Jenkins Job | Jenkins Job Definition
jenkins test api Jenkins Job | Jenkins Job Definition
jenkins test docs ReadTheDocs | Github Workflow Definition
jenkins test ceph-volume all Jenkins Jobs | Jenkins Jobs Definition
jenkins test windows Jenkins Job | Jenkins Job Definition
jenkins test rook e2e Jenkins Job | Jenkins Job Definition

batrick · 2025-03-03T14:24:04Z

doc/dev/release-checklists.rst

+
+    - Tags must be annonated as CMake determines ``CEPH_GIT_NICE_VER`` by calling ``git describe --always``.
+    - vX.0.0 are special ones in the sense they are pushed manually (unlike v.X.2.n which are handled by Jenkins).
+    - vX.0.0 should point to a commit before the first one in a kickoff branch.


@rzarzynski is this actually necessary? Why not point to the merge commit of the kickoff?

Noting that the recently created v20.0.0 is pointing to 048fc68 which is the merge commit that preceded the merge of the kickoff (i.e. the first parent of the merge commit of the kickoff). At the same time one might interpret "a commit before the first one in a kickoff branch" as the base of the kickoff branch which would be 7f414b2. This bullet really needs to be clarified.

@rzarzynski is this actually necessary? Why not point to the merge commit of the kickoff?

The merge commit has two parents: a commit in main and the very last commit in corresponding kickoff branch. Tagging it would mean initial kickoff's commits are not considered as the release's ones leading to wrong version string generated by git describe. I guess the consequence is problems with local testing.

I'm not sure taking merge's left parent changes much in this aspect.

IIRC the quincy and pacific tags are even deeper in their corresponding branches suggesting there was a rebase wthout updating the tag.

@rzarzynski So the expectation is for the tag to be on the base of the kickoff branch, meaning 7f414b2 for tentacle?

I think so.

@rzarzynski Does v20.0.0 tag need to be adjusted in your opinion?

batrick · 2025-03-03T14:24:33Z

doc/dev/release-checklists.rst

-* vX.0.0 are special ones in the sense they are pushed manually (unlike v.X.2.n
-which are handled by Jenkins).
-* vX.0.0 should point to a commit before the first one in a kickoff branch.
+- [x] Initial tag vX.0.0 (so that we can distinguish from (and sort after) the backported (X-1).2.Z versions.


I've pushed v20.0.0: https://github.com/ceph/ceph/tree/v20.0.0

batrick · 2025-03-03T15:20:52Z

https://ceph--62089.org.readthedocs.build/en/62089/dev/release-checklists/

doc/dev/release-checklists.rst

idryomov · 2025-03-17T18:53:29Z

doc/dev/release-checklists.rst

+.. note::
+
+    - Tags must be annonated as CMake determines ``CEPH_GIT_NICE_VER`` by calling ``git describe --always``.
+    - vX.0.0 are special ones in the sense they are pushed manually (unlike v.X.2.n which are handled by Jenkins).


I think the "rc" tags are handled by Jenkins as well?

Suggested change

- vX.0.0 are special ones in the sense they are pushed manually (unlike v.X.2.n which are handled by Jenkins).

- vX.0.0 are special ones in the sense they are pushed manually (unlike vX.1.Z and vX.2.Z which are handled by Jenkins).

not sure, cc @djgalloway @neha-ojha @ljflores @yuriw

idryomov · 2025-03-17T19:06:13Z

doc/dev/release-checklists.rst

+
+    - Tags must be annonated as CMake determines ``CEPH_GIT_NICE_VER`` by calling ``git describe --always``.
+    - vX.0.0 are special ones in the sense they are pushed manually (unlike v.X.2.n which are handled by Jenkins).
+    - vX.0.0 should point to a commit before the first one in a kickoff branch.


Noting that the recently created v20.0.0 is pointing to 048fc68 which is the merge commit that preceded the merge of the kickoff (i.e. the first parent of the merge commit of the kickoff). At the same time one might interpret "a commit before the first one in a kickoff branch" as the base of the kickoff branch which would be 7f414b2. This bullet really needs to be clarified.

doc/dev/release-checklists.rst

Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>

rzarzynski · 2025-03-25T18:42:57Z

doc/dev/release-checklists.rst

 ================

 - [ ] create branch for new release
+- [ ] create vX.3.0 annotated tag on ``main`` so upgrades from new release to main are not wrongly considered downgrades.


rzarzynski · 2025-03-26T07:45:55Z

doc/dev/release-checklists.rst

+
+    - Tags must be annonated as CMake determines ``CEPH_GIT_NICE_VER`` by calling ``git describe --always``.
+    - vX.0.0 are special ones in the sense they are pushed manually (unlike v.X.2.n which are handled by Jenkins).
+    - vX.0.0 should point to a commit before the first one in a kickoff branch.


I think so.

batrick requested a review from a team as a code owner March 3, 2025 14:23

github-actions bot added the documentation label Mar 3, 2025

batrick commented Mar 3, 2025

View reviewed changes

idryomov reviewed Mar 17, 2025

View reviewed changes

batrick force-pushed the tentacle-kickoff-2 branch from 07307f6 to f3169f3 Compare March 17, 2025 19:50

djgalloway reviewed Mar 25, 2025

View reviewed changes

doc/dev/release-checklists.rst Outdated Show resolved Hide resolved

batrick added 2 commits March 25, 2025 13:10

doc/dev/release-checklist: check v20.0.0 tag

a17871d

Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>

doc/dev/release-checklists: add vX.3.0 checklist item

368f9b0

Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>

batrick force-pushed the tentacle-kickoff-2 branch from f3169f3 to 368f9b0 Compare March 25, 2025 17:10

rzarzynski reviewed Mar 26, 2025

View reviewed changes

adk3798 approved these changes Apr 28, 2025

View reviewed changes

batrick merged commit 4233d9b into ceph:main Apr 28, 2025
12 checks passed

batrick deleted the tentacle-kickoff-2 branch April 28, 2025 19:31

batrick mentioned this pull request Dec 6, 2025

Umbrella checklist kickoff! #66524

Open

14 tasks

	- vX.0.0 are special ones in the sense they are pushed manually (unlike v.X.2.n which are handled by Jenkins).
	- vX.0.0 are special ones in the sense they are pushed manually (unlike vX.1.Z and vX.2.Z which are handled by Jenkins).

Conversation

batrick commented Mar 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Contribution Guidelines

Checklist

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

batrick commented Mar 3, 2025

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

batrick commented Mar 3, 2025 •

edited

Loading