[RR] Add Interactive settings and Minor Release Rebase #41
Conversation
PlaidCat
requested review from
bmastbergen,
kerneltoast,
roxanan1996 and
shreeya-patel98
bmastbergen
left a comment
bmastbergen
left a comment
There was a problem hiding this comment.
LGTM, but maybe add the --skip suggestion (you used that multiple times in the demo yesterday)
rolling-release-update.py
Outdated
| print('[rolling release update] Please complete the cherry-pick with:') | ||
| print('[rolling release update] git cherry-pick --continue') | ||
| print('[rolling release update] or abort with:') | ||
| print('[rolling release update] git cherry-pick --abort') |
There was a problem hiding this comment.
or skip with: git cherry-pick --skip ?
There was a problem hiding this comment.
Will add the RUFF changes caused a pretty big conflict that I'm resolving I'll also be including the new minor version update as well when I come back to this
There was a problem hiding this comment.
Yeah, we should have merged all of these before that. Sorry.
PlaidCat
force-pushed
the
{jmaple}_rollling-release-iteractive
branch
from
561c106 to
185d1f1
Compare
There was a problem hiding this comment.
Pull request overview
This PR adds interactive mode functionality to the rolling release update script, allowing engineers to manually resolve merge conflicts during cherry-pick operations and continue the rolling release process. The changes also refactor commit mapping to use a shared helper function and add support for new minor version releases.
Key Changes:
- Added
--interactiveflag to pause on merge conflicts and allow manual resolution - Refactored commit mapping logic to use
get_backport_commit_datafromciq_helpersmodule - Added
--new_minor_versionflag to extend tag detection beyond RESF tags - Made FIPS checks conditional based on product name
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| elif ciq_commit in new_base_commit_map: | ||
| print( | ||
| f"- CIQ Commit {ciq_commit} already present in new base branch: {repo.git.show('--pretty=oneline', '-s', ciq_commit)}" | ||
| f"- CIQ Commit {ciq_commit[:12]} already present in new base branch: {repo.git.show('--pretty=oneline', '-s', ciq_commit)}" |
There was a problem hiding this comment.
[nitpick] Inconsistent formatting in output messages: Line 380 uses '--pretty=%s' (subject only) while line 385 uses '--pretty=oneline' (hash and subject). For consistency and clarity, both should use the same format, preferably '--pretty=%s' since the hash is already shown separately with [:12] truncation.
| f"- CIQ Commit {ciq_commit[:12]} already present in new base branch: {repo.git.show('--pretty=oneline', '-s', ciq_commit)}" | |
| f"- CIQ Commit {ciq_commit[:12]} already present in new base branch: {repo.git.show('--pretty=%s', '-s', ciq_commit)}" |
PlaidCat
changed the title
Previously the tooling would find the common RESF tag but when upgrading minor versions it would not search across centos versions.
The new feature allows a user to run in interactive mode where the rolling release will "pause" while the engineer fixes the failed forward-port and commit. It will then attempt to continue.
One of the critical items as a fork of RedHat is that our kernel updates out from under us and some of the features/fixes/etc we backport in one version of RLC might need to be dropped on the next update. The latest minor update, to 10.1, rebase missed some items that should have been dropped due being present in in CentOS streams branch but not a part of the RHEL minor version updates. WIWT: Fixed some debugging.
PlaidCat
force-pushed
the
{jmaple}_rollling-release-iteractive
branch
from
c7cb948 to
8c9baa6
Compare
The new feature allows a user to run in interactive mode where the rolling release will "pause" while the engineer fixes the failed forward-port and commit. It will then attempt to continue.
Actual Run ctrliq/kernel-src-tree#684