Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update docs/template for new cherry pick approvers #22453

Merged
merged 2 commits into from
May 22, 2019
Merged

Update docs/template for new cherry pick approvers #22453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
313699a
update who can approve cherry picks
mrjoro May 22, 2019
1ef8f6d
update template for new cherry pick approval policy
mrjoro May 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/ISSUE_TEMPLATE/cherry_pick_template.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ name: Cherry-pick template
about: Used to request a cherry-pick. See bit.ly/amp-cherry-pick
title: "\U0001F338 Cherry-pick request for #<ISSUE_NUMBER> into #<RELEASE_ISSUE> (Pending)"
labels: 'Type: Release'
assignees: cramforce
---

<!--
Expand Down Expand Up @@ -77,4 +76,4 @@ TIP: A few sentences summarizing the problem and impact.

---

/cc @cramforce
/cc @ampproject/wg-approvers @ampproject/cherry-pick-approvers
8 changes: 6 additions & 2 deletions contributing/release-schedule.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,12 @@ If you run into any issues or have any questions when requesting a cherry pick,

- Ensure there is a GitHub issue filed for the problem that needs to be resolved *before* filing the cherry pick request issue.
- File the cherry pick request issue using the [Cherry pick request template](https://github.com/ampproject/amphtml/issues/new?title=%F0%9F%8C%B8%20Cherry%20pick%20request%20for%20%3CYOUR_ISSUE_NUMBER%3E%20into%20%3CRELEASE_ISSUE_NUMBER%3E%20%28Pending%29&template=cherry_pick_template.md). Follow the instructions in the template, providing all of the requested data. **Make sure you fill out this issue completely or your cherry pick may not be seen or acted upon.**
- **The [TL](../GOVERNANCE.md) or their designate is the only person who may approve cherry picks.** The TL/designate will update the issue with their decision about whether your fix warrants a cherry pick. You should be available to respond to any questions the TL/designate has regarding your request.
- If the TL/designate approves the cherry pick, the person currently handling releases (onduty) will work with you to ensure the cherry pick is made.
- Get the necessary approval for your cherry pick (indicated via comments on the cherry pick request issue).
- For cherry picks into canary, at least one member of the [Approvers WG](https://github.com/orgs/ampproject/teams/wg-approvers/members) must approve the cherry pick.
- For cherry picks into prod:
- if the fix is a clean rollback that does not require any other changes, at least one member of the [Approvers WG](https://github.com/orgs/ampproject/teams/wg-approvers/members) must approve the cherry pick.
- otherwise, at least one member from the [Cherry Pick Approvers group](https://github.com/orgs/ampproject/teams/cherry-pick-approvers/members) must approve the cherry pick.
- After the cherry pick has been approved, the person currently handling releases (onduty) will work with you to ensure the cherry pick is made.
- **Once the cherry pick is made you are responsible for verifying that the cherry pick you requested fixes the reported issue and that it does not cause other issues.**

**If you are requesting a cherry pick to fix an issue in production** it is very likely you will *also* need a cherry pick into the canary release since otherwise the problem your cherry pick addresses would reappear as soon as the canary release is pushed to production. Work with the onduty person to determine if you need a cherry pick to both and make sure your cherry pick request issue reflects what you determine.
Expand Down