Repository navigation
CherryPicked: [cnv-4.20] [Storage] Update owners - #4470
Conversation
##### Short description: ##### More details: ##### What this PR does / why we need it: ##### Which issue(s) this PR fixes: ##### Special notes for reviewer: ##### jira-ticket: <!-- full-ticket-url needs to be provided. This would add a link to the pull request to the jira and close it when the pull request is merged If the task is not tracked by a Jira ticket, just write "NONE". --> <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Chores** * Updated internal team review assignments for test configurations. --- **Note:** This release contains no user-facing changes. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Signed-off-by: Jenia Peimer <jpeimer@redhat.com>
|
Report bugs in Issues Welcome! 🎉This pull request will be automatically processed with the following features: 🔄 Automatic Actions
📋 Available CommandsPR Status Management
Review & Approval
Testing & Validation
Container Operations
Cherry-pick Operations
Label Management
✅ Merge RequirementsThis PR will be automatically approved when the following conditions are met:
📊 Review ProcessApprovers and ReviewersApprovers:
Reviewers:
Available Labels
AI Features
💡 Tips
For more information, please refer to the project documentation or contact the maintainers. |
|
duyanyan can not be added as reviewer. Reviews may only be requested from collaborators. One or more of the users or teams you specified is not a collaborator of the RedHatQE/openshift-virtualization-tests repository.: 422 {"message": "Reviews may only be requested from collaborators. One or more of the users or teams you specified is not a collaborator of the RedHatQE/openshift-virtualization-tests repository.", "documentation_url": "https://docs.github.com/rest/pulls/review-requests#request-reviewers-for-a-pull-request", "status": "422"} |
|
/approve |
|
/lgtm |
|
New container for quay.io/openshift-cnv/openshift-virtualization-tests:cnv-4.20 published |
## Problem When the webhook server cherry-picks a squash-merged commit, the DCO check on the cherry-pick PR fails because: 1. GitHub squash-merge rewrites the commit author email to the noreply format (e.g., `86722603+user@users.noreply.github.com`) 2. The `Signed-off-by` trailer preserves the original email (e.g., `user@redhat.com`) 3. `git cherry-pick` replays the commit with the mismatched emails 4. The DCO app checks that `Signed-off-by` email matches the commit author email → fails This requires manual sign-off approval for every cherry-picked PR. ## Solution Add `_restore_original_author_for_cherry_pick()` to `RunnerHandler` that: - Fetches the original PR's commits via `pull_request.get_commits()` - Searches for a `Signed-off-by` trailer (last commit first) - Only amends if the original PR actually had a sign-off - Compares the sign-off email against the cherry-picked commit's author email - If they differ, amends the commit author to match the original sign-off - Called after successful cherry-pick (clean or AI-resolved) before push ## Testing - 8 new unit tests in `TestRestoreOriginalAuthorForCherryPick` covering all paths - Updated existing cherry-pick integration tests to mock the new method - All 1539 tests pass, 90.46% coverage ## References - Original PR that was signed off: RedHatQE/openshift-virtualization-tests#4461 - Cherry-pick PR that needed manual sign-off: RedHatQE/openshift-virtualization-tests#4470 Closes: #1072 Assisted-by: Claude <noreply@anthropic.com> <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Bug Fixes** * After resolving a cherry-pick, the system now attempts to restore the original commit author when a Signed-off-by trailer differs; it skips when the trailer matches or is absent, logs warnings on read/amend failures, and performs this restore before pushing the new branch. * **Tests** * Added comprehensive tests covering successful restores, skips, amend failures, missing trailers, multi-commit selection, warning paths, cancellation, and error handling. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Signed-off-by: rnetser <rnetser@redhat.com>
Cherry-pick from
mainbranch, original PR: #4461, PR owner: jpeimer