Fix duplicate entries in CODEOWNERS causing cherry-pick conflicts#18866
Closed
Fix duplicate entries in CODEOWNERS causing cherry-pick conflicts#18866
Conversation
Member
|
This is already being resolved in #18863 |
Copilot
AI
changed the title
[WIP] [Failed-AutoCherryPick] - Update the New team names for old team-rocket components
Fix duplicate entries in CODEOWNERS causing cherry-pick conflicts
Jul 1, 2025
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
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.
Issue
The auto-cherry-pick of PR #18854 to branch 6.17.z failed due to conflicts in the CODEOWNERS file. The original PR successfully updated team names from "Rocket" to "Endeavour", "Phoenix-content", and "Phoenix-subscriptions", but left duplicate entries that caused merge conflicts.
Root Cause
When PR #18854 reassigned test files from
@SatelliteQE/team-rocketto@SatelliteQE/team-endeavourand@SatelliteQE/team-phoenix, it added new entries to the CODEOWNERS file but didn't remove the old ones. This created duplicate assignments for the same files:Changes Made
test_host.pyfiles (api, cli, ui variants)test_globalparam.pytest_pulp3_filesystem.pyVerification
✅ No duplicate entries remain in CODEOWNERS
✅ All team assignments are consistent between docstrings and CODEOWNERS
✅ Current team distribution: 45 Rocket, 101 Phoenix, 130 Endeavour
✅ Repository is ready for successful cherry-picking to release branches
The repository is now in a clean state that should allow the auto-cherry-pick workflow to succeed when retried.
Fixes #18862.
💬 Share your feedback on Copilot coding agent for the chance to win a $200 gift card! Click here to start the survey.