Fix support for multiple discover phases in upgrade execute plugin#4633
Merged
Conversation
tcornell-bus
added
step | execute
tcornell-bus
commented
Mar 2, 2026
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Code Review
This pull request refactors the task gathering logic in the execute step by introducing a gather_tasks method in ExecutePlugin, which is then implemented for both internal and upgrade executors. The upgrade executor is also updated to correctly handle multiple discover phases, ensuring test names are restored on a per-phase basis. The changes are well-tested and improve the modularity of the execution step. My feedback includes a suggestion to improve the robustness of state restoration in the upgrade plugin by using try...finally blocks.
Note: Security Review is unavailable for this PR.
happz
reviewed
Mar 2, 2026
happz
reviewed
Mar 2, 2026
tcornell-bus
added
the
ci | full test
Contributor
Author
|
packit /test |
happz
approved these changes
Mar 3, 2026
happz
force-pushed
the
tcornell-multi-discover-upgrade
branch
from
cf99977 to
b2ba77b
Compare
LecrisUT
reviewed
Mar 3, 2026
execute plugin. Extract task gathering logic for upgrade plugin into a dedicated gather_tasks method following the same pattern as internal (tmt) execute. Allow upgrade execute plugin to handle multiple discover phases by iterating through each phase when running tests before and after upgrade. Fix test name restoration to occur per-phase to avoid iteration order issues. Assisted-by: Cursor
Turned gather_tasks() into tasks() iterator Moved child function docstrings for tasks() into the function body Moved the extra discover phase to full.sh test to save time
Add TODOs decribing possible future refactors. Fix the upgrade tests by making the extra-phase plan its own plan.
tcornell-bus
force-pushed
the
tcornell-multi-discover-upgrade
branch
from
b2ba77b to
0502fee
Compare
skycastlelily
approved these changes
Mar 4, 2026
skycastlelily
left a comment
skycastlelily
left a comment
Contributor
There was a problem hiding this comment.
LGTM,and all the tests passed locally :)
LecrisUT
approved these changes
Mar 4, 2026
LecrisUT
left a comment
LecrisUT
left a comment
Member
There was a problem hiding this comment.
Great, thanks a lot for the context and trackers
happz
approved these changes
Mar 4, 2026
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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.
Extract task iterator logic for upgrade plugin into a dedicated tasks method following the same pattern as internal (tmt) execute.
Allow upgrade execute plugin to handle multiple discover phases by iterating through each phase when running tests before and after upgrade.
Fix test name restoration to occur per-phase to avoid iteration order issues.
Assisted-by: Cursor
Fixes: #3894
Pull Request Checklist