Skip to content

Conversation

@valen-mascarenhas14
Copy link

Fix for #544
This change fixes the behavior in the cherrypicker plugin where processing would stop after the first cherry-pick failure, even if additional valid targets were requested in the same comment.
The logic is updated to continue processing remaining branches while aggregating and reporting all errors at the end.

Key change

var errs []error

for _, targetBranch := range sets.List(sets.KeySet(commands)) {
    if err := s.handle(...); err != nil {
        errs = append(errs, err)
        continue 
    }
}

if len(errs) > 0 {
    return log, utilerrors.NewAggregate(errs)
}

This ensures that:

  • Successful cherry-picks are not skipped due to unrelated failures
  • Failures are still properly surfaced to the user

@netlify
Copy link

netlify bot commented Dec 9, 2025

Deploy Preview for k8s-prow ready!

Name Link
🔨 Latest commit 4a9c036
🔍 Latest deploy log https://app.netlify.com/projects/k8s-prow/deploys/6938604f7b0b400008a5cf37
😎 Deploy Preview https://deploy-preview-570--k8s-prow.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify project configuration.

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: valen-mascarenhas14
Once this PR has been reviewed and has the lgtm label, please assign matthyx for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot
Copy link
Contributor

Welcome @valen-mascarenhas14!

It looks like this is your first PR to kubernetes-sigs/prow 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/prow has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Dec 9, 2025
@k8s-ci-robot
Copy link
Contributor

Hi @valen-mascarenhas14. Thanks for your PR.

I'm waiting for a github.com member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Dec 9, 2025
@matthyx
Copy link
Contributor

matthyx commented Dec 9, 2025

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Dec 9, 2025
@matthyx
Copy link
Contributor

matthyx commented Dec 10, 2025

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 10, 2025
@valen-mascarenhas14
Copy link
Author

valen-mascarenhas14 commented Jan 16, 2026

@droslean @BenTheElder @petr-muller Any inputs on this ?

@matthyx
Copy link
Contributor

matthyx commented Jan 16, 2026

@valen-mascarenhas14 sorry I forgot about this... let me know if after few days you don't hear from them I'll approve

}
}

if len(errs) > 0 {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You don't need this check. You can just return log, utilerrors.NewAggregate(errs)


if err := s.handle(branchLog, ic.Comment.User.Login, &ic.Comment, org, repo, targetBranch, baseBranch, commands[targetBranch], title, body, num); err != nil {
return log, fmt.Errorf("failed to handle cherrypick for %s: %w", targetBranch, err)
branchLog.WithError(err).Error("Cherrypick failed")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the end all of the errors should be logged since you will return them.

testCherryPickIC(localgit.NewV2, t)
}

func TestCherryPickMultipleBranches_OneFailsOthersProceed(t *testing.T) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You shouldn't need a new test function just for that specific case. Just ensure that you will add this test case to the existing tests.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants