Description
This issue is for tracking cherry-picks to the release branch. Following is release branch for the 2.7.1 release.
Our plan from this point is roughly the following:
- Phase 1 (until 5/19): Cherry-pick post deadline (End of day 5PM PST)
- Phase 2 (after 5/19): Perform extended integration/stability/performance testing based on Release Candidate builds.
Only issues that have ‘cherry-picks’ in this tracker will be considered for the release.
Cherry-Pick Criteria
Phase 1 (until 5/19):
Please note: No feature work allowed for cherry picks. The Releng team relies on the cherry pick process to manage risk to release quality, i.e. by porting a small set of commit from trunk that are "must-have" into the release branch, we limit the change to the minimal to address pressing issues. Thus, not everything a developer land into the trunk will make it into the release. So, please consider the criteria below and follow the cherry picking process. Only low-risk changes may be cherry-picked from master:
- Fixes to regressions against the most recent release (e.g. 2.7.0 for 2.7.1 release; see module: regression issue list)
- Low risk critical fixes for: silent correctness, backwards compatibility, crashes, deadlocks, (large) memory leaks
- Critical Fixes to new features being introduced in 2.7.0 release
- Documentation improvements
- Release branch specific changes (e.g. blocking ci fixes, change version identifiers)
Any other change requires special dispensation from the release managers (currently @atalman, @ZainRizvi , @seemethere @huydhn, @malfet). If this applies to your change please write "Special Dispensation" in the "Criteria Category:" template below and explain.
Phase 2 (after 5/19):
Note that changes here require us to rebuild a Release Candidate and restart extended testing (likely delaying the release). Therefore, the only accepted changes are Release-blocking critical fixes for: silent correctness, backwards compatibility, crashes, deadlocks, (large) memory leaks
Changes will likely require a discussion with the larger release team over VC or Slack.
Cherry-Pick Process
-
Ensure your PR has landed in master. This does not apply for release-branch specific changes (see Phase 1 criteria).
-
Create (but do not land) a PR against the release branch.
# Find the hash of the commit you want to cherry pick # (for example, abcdef12345) git log git fetch origin release/2.7 git checkout release/2.7 git cherry-pick abcdef12345 # Submit a PR based against 'release/2.7' either: # via the GitHub UI git push my-fork # via the GitHub CLI gh pr create --base release/2.7
-
Make a request below with the following format:
Link to landed trunk PR (if applicable):
*
Link to release branch PR:
*
Criteria Category:
*
- Someone from the release team will reply with approved / denied or ask for more information.
- If approved, someone from the release team will merge your PR once the tests pass. Do not land the release branch PR yourself.
NOTE: Our normal tools (ghstack / ghimport, etc.) do not work on the release branch.
See HUD 2.7
Versions
2.7.1