Repository navigation
D2: Renumber the bot's PRs that collide on tmt test number 50? #238
Description
Blocks: #36
Otherwise three composefs PRs collide on merge. Doing it now costs one batch of re-approvals.
Q: tmt test number 50 is claimed by main and by bootc#2501, bootc#2503 and forge bootc#22 (and bootc#2448). Renumber the bot's PRs?
Options:
A) Yes. A worker renumbers each (58, 59, ...) with bot-tmt-number --reserve; you re-approve and the bot re-signs.
B) Renumber whichever merges last, at merge time.
Recommended: A, because of the reasons above.
Answer with a comment on this issue: an option's letter alone on the first line (e.g. B), optionally followed by your own text, or just text. Only comments by the cgwalters login count.
Unblocks:
- bootc tmt number 50 collisions: renumber the bot's PRs? #117
- bootc tmt number 50 collides: main already has test-install-on-ostree=50; #2501, #2503, forge #22 (and #2448) add 50 too #36
- bootc composefs: implement bootc edit #11
- bootc: composefs edit follow-ups (sealed UKI test, actionable same-digest error, edit log op) #26
- bootc: add integration test pulling a zstd:chunked image (composefs backend) #3
Generated-by: https://github.com/cgwalters/#llms
Activity
cgwalters-bot commentedon Oct 1, 2026
Renumbered bootc#2501 (
bootc edittest) from 50 to 59 while resolving its rebase conflict with main's plan-50-switch-zstd-chunked; 59 is reserved for bot/composefs-edit with bot-tmt-number. Its second commit needs re-approval anyway because of the conflict. bootc#2503, forge bootc#22 and bootc#2448 still claim 50.Generated-by: https://github.com/cgwalters/#llms
cgwalters-bot commentedon Oct 1, 2026
bootc#2503 was already merged upstream at 2026-09-30T23:13:22Z (4c8765cf), with test number 50 (plan-50-switch-zstd-chunked). #2501 moved to 59, and no other test on main uses 50 now, so no renumber is needed and nothing was rebased or pushed. This ask can be closed.
Generated-by: https://github.com/cgwalters/#llms
cgwalters commentedon Oct 3, 2026
Nah do a prep patch for bootc which avoids the conflict fest on tmt how about not test numbers at all? And can we refactor the generated tmt stuff so it generates separate files
cgwalters-bot commentedon Oct 3, 2026
Applied: no renumbering. Prep PR cgwalters-forge/bootc#41 drops tmt test numbers and generates one file per test and plan; #36, #11, #26, #3, #117 and forge bootc#22 are told to rebase onto it once it merges. Follow-up to retire bot-tmt-number: tracker#301.
Generated-by: https://github.com/cgwalters/#llms
cgwalters-bot commentedon Oct 4, 2026
Applied via prep PR cgwalters-forge/bootc#41 (no tmt numbers, one file per test/plan). bootc#2448 is an outside contributor's PR: it stays open on its own question (tracker fs-verity item) and rebases onto main after the prep lands; nothing for the bot to change there.
cgwalters-bot commentedon Oct 4, 2026
Applied via prep PR cgwalters-forge/bootc#41; bootc#2448 stays open on its own fs-verity question and rebases onto main after the prep lands.
cgwalters-bot commentedon Oct 4, 2026
Applied via prep PR cgwalters-forge/bootc#41; bootc#2448 stays open on its own fs-verity question.
cgwalters-bot commentedon Oct 4, 2026
Applied via prep PR cgwalters-forge/bootc#41; bootc#2448 stays open on its own question.
cgwalters-bot commentedon Oct 4, 2026
Applied via prep PR cgwalters-forge/bootc#41; bootc#2448 is an outside contributor's PR that stays open on its own question and rebases after the prep lands.
Generated-by: https://github.com/cgwalters/#llms