Test-infra: Cherrypick PRs Shouldn't Require Approval

Created on 8 Feb 2017  路  19Comments  路  Source: kubernetes/test-infra

Cherrypicks that have already been merged into master should not require approval

help wanted lifecyclrotten

Most helpful comment

Cherrypicks that have already been merged into master should not require approval

I disagree with this. Approval for a change going into master does not automatically mean it is appropriate for a release branch.

All 19 comments

@Sevii may require gaining some familiarity with the Approvers process, but also something worth getting started on

When we cut a release branch, we can remove all OWNERS files except for the top-level file, and set the release owner as the approver within it. Then our OWNERS implementation doesn't need to change :)

@spxtr that might make cherrypicks and fast-forwards somewhat trickier.

How so?

I guess my main concern is this situation:

  1. We branch release-x.y from master for x.y.0-beta.0
  2. We remove all OWNERS files in the repo, and replace the top-level OWNERS with the release owner
  3. We continue adding changes to master, including some that affect OWNERS files
  4. We try to fast-foward release-x.y from master. Now we're probably going to run into conflicts, because there are changes to deleted files, right?

Ideally, changes to OWNERS files won't be cherry-picked, since they will be in their own PRs. You're right though, that probably will be annoying.

Yeah, I'm less worried about cherry-picks and more worried about fast-fowards early in the release cycle (during code freeze), which I guess isn't what this issue is really talking about.

As long as we don't rewrite the OWNERS files until we exit code freeze (i.e. when we cut the RC), this should be OK.

Should cherrypicked PRs should get approval from the owner of the release?

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

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

/lifecycle frozen

/remove-lifecycle rotten

Realistically if kubernetes org can move to using the cherry-picker robot it's easier to implement this by looking at the author of the PRs

Cherrypicks that have already been merged into master should not require approval

I disagree with this. Approval for a change going into master does not automatically mean it is appropriate for a release branch.

I disagree with this. Approval for a change going into master does not automatically mean it is appropriate for a release branch.

+1

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

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

Rotten issues close after 30d of inactivity.
Reopen the issue with /reopen.
Mark the issue as fresh with /remove-lifecycle rotten.

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

@fejta-bot: Closing this issue.

In response to this:

Rotten issues close after 30d of inactivity.
Reopen the issue with /reopen.
Mark the issue as fresh with /remove-lifecycle rotten.

Send feedback to sig-testing, kubernetes/test-infra and/or fejta.
/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.

Was this page helpful?
0 / 5 - 0 ratings