Skip to content

CherryPicked: [cnv-4.20] [Storage] Update owners - #4470

Merged
rnetser merged 1 commit into
cnv-4.20from
CherryPicked-422_owners-i3AFc
Apr 15, 2026
Merged

rnetser merged 1 commit into
cnv-4.20from
CherryPicked-422_owners-i3AFc

Conversation

@cnv-tests-github-webhook-dollierp

Copy link
Copy Markdown

Cherry-pick from main branch, original PR: #4461, PR owner: jpeimer

##### 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>
@openshift-virtualization-qe-bot-4

Copy link
Copy Markdown

Report bugs in Issues

Welcome! 🎉

This pull request will be automatically processed with the following features:

🔄 Automatic Actions

  • Reviewer Assignment: Reviewers are automatically assigned based on the OWNERS file in the repository root
  • Size Labeling: PR size labels (XS, S, M, L, XL, XXL) are automatically applied based on changes
  • Issue Creation: A tracking issue is created for this PR and will be closed when the PR is merged or closed
  • Branch Labeling: Branch-specific labels are applied to track the target branch
  • Auto-verification: Auto-verified users have their PRs automatically marked as verified
  • Labels: Enabled categories: branch, can-be-merged, cherry-pick, has-conflicts, hold, needs-rebase, size, verified, wip

📋 Available Commands

PR Status Management

  • /wip - Mark PR as work in progress (adds WIP: prefix to title)
  • /wip cancel - Remove work in progress status
  • /hold - Block PR merging (approvers only)
  • /hold cancel - Unblock PR merging
  • /verified - Mark PR as verified
  • /verified cancel - Remove verification status
  • /reprocess - Trigger complete PR workflow reprocessing (useful if webhook failed or configuration changed)
  • /regenerate-welcome - Regenerate this welcome message

Review & Approval

  • /lgtm - Approve changes (looks good to me)
  • /approve - Approve PR (approvers only)
  • /assign-reviewers - Assign reviewers based on OWNERS file
  • /assign-reviewer @username - Assign specific reviewer
  • /check-can-merge - Check if PR meets merge requirements

Testing & Validation

  • /retest tox - Run Python test suite with tox
  • /retest build-container - Rebuild and test container image
  • /retest verify-bugs-are-open - verify-bugs-are-open
  • /retest all - Run all available tests

Container Operations

  • /build-and-push-container - Build and push container image (tagged with PR number)
    • Supports additional build arguments: /build-and-push-container --build-arg KEY=value

Cherry-pick Operations

  • /cherry-pick <branch> - Schedule cherry-pick to target branch when PR is merged
    • Multiple branches: /cherry-pick branch1 branch2 branch3

Label Management

  • /<label-name> - Add a label to the PR
  • /<label-name> cancel - Remove a label from the PR

✅ Merge Requirements

This PR will be automatically approved when the following conditions are met:

  1. Approval: /approve from at least one approver
  2. LGTM Count: Minimum 2 /lgtm from reviewers
  3. Status Checks: All required status checks must pass
  4. No Blockers: No wip, hold, has-conflicts labels and PR must be mergeable (no conflicts)
  5. Verified: PR must be marked as verified

📊 Review Process

Approvers and Reviewers

Approvers:

  • dshchedr
  • jpeimer
  • myakove
  • rnetser
  • vsibirsk

Reviewers:

  • Ahmad-Hafe
  • RoniKishner
  • dalia-frank
  • dshchedr
  • duyanyan
  • josemacassan
  • jpeimer
  • kgoldbla
  • kshvaika
  • rnetser
  • stesrn
  • vsibirsk
Available Labels
  • hold
  • verified
  • wip
  • lgtm
  • approve
AI Features
  • Cherry-Pick Conflict Resolution: Enabled (claude/claude-opus-4-6[1m])

💡 Tips

  • WIP Status: Use /wip when your PR is not ready for review
  • Verification: The verified label is removed on new commits unless the push is detected as a clean rebase
  • Cherry-picking: Cherry-pick labels are processed when the PR is merged
  • Container Builds: Container images are automatically tagged with the PR number
  • Permission Levels: Some commands require approver permissions
  • Auto-verified Users: Certain users have automatic verification and merge privileges

For more information, please refer to the project documentation or contact the maintainers.

@openshift-virtualization-qe-bot-4

Copy link
Copy Markdown

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"}

@rnetser

rnetser commented Apr 15, 2026

Copy link
Copy Markdown
Collaborator

/approve
/verified

@rnetser

rnetser commented Apr 15, 2026

Copy link
Copy Markdown
Collaborator

/lgtm

@rnetser
rnetser merged commit 1b429ed into cnv-4.20 Apr 15, 2026
17 of 19 checks passed
@rnetser
rnetser deleted the CherryPicked-422_owners-i3AFc branch April 15, 2026 18:39
@openshift-virtualization-qe-bot-5

Copy link
Copy Markdown

New container for quay.io/openshift-cnv/openshift-virtualization-tests:cnv-4.20 published

myakove pushed a commit to myk-org/github-webhook-server that referenced this pull request Apr 26, 2026
## 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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants