diff options
| author | Kubernetes Prow Robot <k8s-ci-robot@users.noreply.github.com> | 2021-02-16 00:23:05 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-16 00:23:05 -0800 |
| commit | cc784edd4029cda3a8bceefa04c48f13d8802b10 (patch) | |
| tree | 5c52c1cb065204d7c61b8ad61520b388f7d9d9a9 | |
| parent | a1d6d6f2ec053c525dd4a2b9e2c024f55d86ace5 (diff) | |
| parent | 2c7d29487794953f397cee55d65106c8a9d61f70 (diff) | |
Merge pull request #5527 from hasheddan/cp-all-branch
Require applicable cherry picks to active branches
| -rw-r--r-- | contributors/devel/sig-release/cherry-picks.md | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/contributors/devel/sig-release/cherry-picks.md b/contributors/devel/sig-release/cherry-picks.md index 0006fae3..77335df6 100644 --- a/contributors/devel/sig-release/cherry-picks.md +++ b/contributors/devel/sig-release/cherry-picks.md @@ -86,7 +86,9 @@ patch release branches. Please see our [recommended Git workflow](/contributors/guide/github-workflow.md#workflow). - You will need to run the cherry pick script separately for each patch - release you want to cherry pick to. + release you want to cherry pick to. Cherry picks should be applied to all + [active](https://github.com/kubernetes/sig-release/blob/master/releases/patch-releases.md#detailed-release-history-for-active-branches) + release branches where the fix is applicable. - Your cherry pick PR will immediately get the `do-not-merge/cherry-pick-not-approved` label. @@ -117,6 +119,12 @@ pull requests on the `master` branch in that they: release branch (for example, milestone v1.11 for a cherry pick onto branch `release-1.11`). This is normally done for you by automation. +- A separate cherry pick pull request should be open for every applicable target + branch. This ensures that the fix will be present on every active branch for a + given set of patch releases. If a fix is only applicable to a subset of active + branches, it is helpful to note why that is the case on the parent pull + request or on the cherry pick pull requests to the applicable branches. + - Have one additional level of review in that they must be approved specifically for cherry pick by branch approvers. |