Community: How to cherry pick a fix to multiple release branches?

Created on 29 Aug 2017 · 18Comments · Source: kubernetes/community

After reading https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md, I'm unclear on how a patch that needs to be cherry-pick to two or more branches should be handled.

For example, say 1.8 is under development and a fix needs to be cherry picked to 1.6 as well as 1.7.

Are cherry-picks to older branches automatically carried to newer branches? If so, should the milestone be set to the oldest branch? If not, how can a cherry-pick be applied to multiple branches?

Happy to submit a PR to update the documentation once this is clarified. Thanks!

kinfeature lifecyclstale sicontributor-experience sirelease

Source

jpbetz

Most helpful comment

set the milestone to the oldest branch

cc the patch manager for each release (with info about who the person is). This is really needed because unless you are highly involved in the project, it isn't easy to find who the patch manager is.

Those seem like excellent tasks for the bot. /cc @kubernetes/sig-contributor-experience-feature-requests

liggitt on 3 Mar 2018

👍3

All 18 comments

cc @mml @wojtek-t

jpbetz on 29 Aug 2017

Are cherry-picks to older branches automatically carried to newer branches?

No.

If so, should the milestone be set to the oldest branch?

I think that's reasonable.

You'll have to tag each patch release manager to approve each cherrypick, except the release the milestone is set to, because the patch release manager will notice the original PR as it has the milestone and the cherryp-pick-required label.

caesarxuchao on 29 Aug 2017

Thanks @caesarxuchao. What do you mean by "tag each patch release manager"?

jpbetz on 29 Aug 2017

I mean cc them :)

caesarxuchao on 29 Aug 2017

/sig release contributor-experience

xiangpengzhao on 3 Sep 2017

Issues go stale after 90d of inactivity.
Mark the issue as fresh with /remove-lifecycle stale.
Stale issues rot after an additional 30d of inactivity and eventually close.

Prevent issues from auto-closing with an /lifecycle frozen comment.

If this issue is safe to close now please do so with /close.

Send feedback to sig-testing, kubernetes/test-infra and/or @fejta.
/lifecycle stale

fejta-bot on 10 Jan 2018

Stale issues rot after 30d of inactivity.
Mark the issue as fresh with /remove-lifecycle rotten.
Rotten issues close after an additional 30d of inactivity.

If this issue is safe to close now please do so with /close.

Send feedback to sig-testing, kubernetes/test-infra and/or fejta.
/lifecycle rotten
/remove-lifecycle stale

fejta-bot on 11 Feb 2018

/remove-lifecycle rotten

Including the following information in the docs can be useful:

a separate cherry pick needs to be created against each branch
set the milestone to the oldest branch
cc the patch manager for each release (with info about who the person is). This is really needed because unless you are highly involved in the project, it isn't easy to find who the patch manager is.

nikhita on 3 Mar 2018

set the milestone to the oldest branch

cc the patch manager for each release (with info about who the person is). This is really needed because unless you are highly involved in the project, it isn't easy to find who the patch manager is.

Those seem like excellent tasks for the bot. /cc @kubernetes/sig-contributor-experience-feature-requests

liggitt on 3 Mar 2018

👍3

I am a newbie and I have this question. https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md still does not answer it. There should be clear step-by-step instructions for a contributor.

MikeSpreitzer on 5 Mar 2018

cc: @spiffxp

cblecker on 5 Mar 2018

Issues go stale after 90d of inactivity.
Mark the issue as fresh with /remove-lifecycle stale.
Stale issues rot after an additional 30d of inactivity and eventually close.

If this issue is safe to close now please do so with /close.

Send feedback to sig-testing, kubernetes/test-infra and/or fejta.
/lifecycle stale

fejta-bot on 3 Jun 2018

/remove-lifecycle stale

nikhita on 3 Jun 2018

Issues go stale after 90d of inactivity.
Mark the issue as fresh with /remove-lifecycle stale.
Stale issues rot after an additional 30d of inactivity and eventually close.

If this issue is safe to close now please do so with /close.

Send feedback to sig-testing, kubernetes/test-infra and/or fejta.
/lifecycle stale

fejta-bot on 1 Sep 2018

cc the patch manager for each release (with info about who the person is). This is really needed because unless you are highly involved in the project, it isn't easy to find who the patch manager is.

Automation is in place for this.

/remove-lifecycle stale
PR open

nikhita on 3 Sep 2018

Issues go stale after 90d of inactivity.
Mark the issue as fresh with /remove-lifecycle stale.
Stale issues rot after an additional 30d of inactivity and eventually close.

If this issue is safe to close now please do so with /close.

Send feedback to sig-testing, kubernetes/test-infra and/or fejta.
/lifecycle stale

fejta-bot on 2 Dec 2018

The cherry-pick doc recently went through a round of improvements in https://github.com/kubernetes/community/pull/2408 and https://github.com/kubernetes/community/pull/1980 and the update covers these points. Automation was also improved in https://github.com/kubernetes/test-infra/pull/9128.

Closing as this is now done.
/close

nikhita on 3 Dec 2018

@nikhita: Closing this issue.

In response to this:

The cherry-pick doc recently went through a round of improvements in https://github.com/kubernetes/community/pull/2408 and https://github.com/kubernetes/community/pull/1980 and the update covers these points. Automation was also improved in https://github.com/kubernetes/test-infra/pull/9128.

Closing as this is now done.
/close

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/test-infra repository.