Skip to content
This repository has been archived by the owner on Apr 17, 2019. It is now read-only.

Run separate merge queues for separate branches #156

Closed
roberthbailey opened this issue Oct 9, 2015 · 8 comments
Closed

Run separate merge queues for separate branches #156

roberthbailey opened this issue Oct 9, 2015 · 8 comments

Comments

@roberthbailey
Copy link
Contributor

In particular, each release branch has it's own e2e test validating the release branch. Merges to the release branch shouldn't be blocked if e2e tests at HEAD are failing, and merges to HEAD shouldn't be blocked if tests against the release branch are failing.

We currently have 2 release branches (release-1.0 and release-1.1) that should have separate merge-bots configured.

/cc @lavalamp @eparis

@brendandburns
Copy link
Contributor

Concretely I think we should have different go-routines in the same binary.

--brendan

@roberthbailey
Copy link
Contributor Author

Sure, I didn't want to specify an implementation, just the desired behavior.

@ikehz ikehz self-assigned this Oct 15, 2015
@ikehz
Copy link
Contributor

ikehz commented Oct 15, 2015

This goes along with the work I've been doing to set up critical builds for the release-1.1 branch. I can try to move the needle on this at some point, but, Brendan, feel free to take this if you want.

@ikehz
Copy link
Contributor

ikehz commented Nov 5, 2015

We should also just consider only allowing the merge-bot to merge to master. The flow of PRs to a release branch should be slow, (they're all cherrypicks,) and we should be skeptical of all of them.

What do you think @brendandburns?

FYI @quinton-hoole @fgrzadkowski

@roberthbailey
Copy link
Contributor Author

Yes, please.

@ghost
Copy link

ghost commented Nov 5, 2015

SGTM.

@spiffxp
Copy link
Contributor

spiffxp commented Mar 16, 2016

/cc @kubernetes/sig-testing

@ikehz ikehz removed their assignment Apr 4, 2016
@ikehz
Copy link
Contributor

ikehz commented Apr 4, 2016

I think this is actually subsumed/changed/fixed by @eparis's work on auto-cherry-picking.

@ikehz ikehz closed this as completed Apr 4, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

No branches or pull requests

4 participants