Moving kubernetes/kubernetes from the submit queue to tide
Aaron Crickenberger
Hi all,
tl;dr We will be swapping mungegithub for tide on kubernetes/kubernetes Monday 2018-09-10 at or around 10:30am PT, there will be no changes to how you interact with PRs to get them merged; if you have a persistent problem with a PR not merging as expected not explained by its statuses, please come by #sig-release
You’ve seen notice of this in Tim Pepper’s latest release-1.12 e-mail [1], at contributor experience [2], and at this week’s community meeting [3]. If you missed it, here are my notes:
Show me the docs:
- I just want my PR to merge [4] (using whatever labels the release team tells me to [5])
- I just want my repo added to tide [6]
Ways that tide differs from the submit queue:
- Tide uses GitHub queries to select PR’s into “tide pools”, runs as many in a batch as it can (“tide comes in”), and merges them (“tide goes out”)
- Since there is no queue, there is no ordering, ie: applying queue/fix has no effect
- Tide always reruns tests (it knows how to run) prior to merge, ie: applying retest-not-required has no effect (there is an open issue if we find we need this [7])
- Tide has a few expected behaviors that may seem strange, mainly because tide favors batches and tests against the most recent base branch commit [8]
If you used the submit queue UI:
- https://submit-queue.k8s.io/#/prs -> https://prow.k8s.io/pr
- https://submit-queue.k8s.io/#/queue -> https://prow.k8s.io/tide.html
- https://submit-queue.k8s.io/#/history -> n/a
- https://submit-queue.k8s.io/#/ci -> http://velodrome.k8s.io/dashboard/db/monitoring?orgId=1
Our rollout plan:
- Tracking issue: https://github.com/kubernetes/test-infra/issues/3866
- Put together a PR with tide queries for k/k master, and k/k release branches
- Final checkpoint at release-1.12 burndown meeting monday 10am PT
- Turn down mungegithub instances: misc-mungers, submit-queue, cherrypick
- Merge PR with tide queries
- Tide will add a new `tide` status context to all open PRs (the submit-queue status will no longer be set and will be ignored on PRs where it still exists)
- We will keep an eye on things, check in daily with release team
- If we find we need to roll back, revert PR, turn up mungegithub instances
If you have a persistent problem with a PR not merging as expected, or a PR merging when you didn’t think it should:
- Double-check the status contexts on the PR, and look for the PR on prow’s PR dashboard [9]
- Contact us in #sig-release on kubernetes.slack.com
- We may ask you to file an issue against kubernetes/test-infra with the title “pr-merge-issue: pr org/repo#xyz” and explain in the description what did or did not happen that you expected
Any other questions or objections, please reply here or come to #sig-release on kubernetes.slack.com. Thanks!
- aaron
[1] https://groups.google.com/d/msg/kubernetes-dev/pL3M8Qt0SxU/uB4E9R-HBAAJ
[3] https://www.youtube.com/watch?v=xTEBQjnKLi4&feature=youtu.be&t=17m04s
[4] https://github.com/kubernetes/test-infra/blob/master/prow/cmd/tide/pr-authors.md
[5] https://github.com/kubernetes/community/blob/master/contributors/devel/release.md#tldr
[6] https://github.com/kubernetes/test-infra/blob/master/prow/cmd/tide/config.md