summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Crickenberger <spiffxp@google.com>2019-01-11 18:53:44 -0800
committerAaron Crickenberger <spiffxp@google.com>2019-01-11 18:53:44 -0800
commit42883cf4c9c99cdba5f9a67729a32400054563a1 (patch)
tree54ac6b5eea7b83385eae34e0e3a095abf99c5d7a
parent90f3ff4c904ea009fa2d58313a79452bba01d55d (diff)
Remove code slush
We decided a clear warning to brace for code freeze was sufficient, and a whole extra delineated phase wasn't worth the effort. We'll still remind folks not to do mean things like land massive changes or refactors N days before code freeze. ref: #269
-rw-r--r--contributors/devel/release.md22
1 files changed, 2 insertions, 20 deletions
diff --git a/contributors/devel/release.md b/contributors/devel/release.md
index b08642f7..651f5e1d 100644
--- a/contributors/devel/release.md
+++ b/contributors/devel/release.md
@@ -41,14 +41,12 @@ If you want your PR to get merged, it needs the following required labels and mi
<tr>
<td></td>
<td>Normal Dev</td>
-<td>Code Slush</td>
<td>Code Freeze</td>
<td>Post-Release</td>
</tr>
<tr>
<td></td>
<td>Weeks 1-8</td>
-<td>Week 9</td>
<td>Weeks 10-12</td>
<td>Weeks 12+</td>
</tr>
@@ -65,17 +63,6 @@ If you want your PR to get merged, it needs the following required labels and mi
</td>
<td>
<ul>
-<!--Week 9-->
-<li>/milestone {v1.y}</li>
-<li>/sig {name}</li>
-<li>/kind {type}</li>
-<li>/priority {level}</li>
-<li>/lgtm</li>
-<li>/approved</li>
-</ul>
-</td>
-<td>
-<ul>
<!--Weeks 10-12-->
<li>/milestone {v1.y}</li>
<li>/sig {name}</li>
@@ -151,10 +138,7 @@ planning artifacts in conjunction with the Release Team's [enhancements
lead](https://git.k8s.io/sig-release/release-team/role-handbooks/enhancements/README.md).
Implementation and bugfixing is ongoing across the cycle, but
-culminates in a code slush and code freeze period:
-* The **code slush** starts in week ~9 of the release cycle. The master
- branch only accepts PRs for the upcoming release milestone. No additional feature
- development is merged after this point.
+culminates in a code freeze period:
* The **code freeze** starts in week ~10 and continues for ~2 weeks.
Only critical bug fixes are accepted into the release codebase.
@@ -267,8 +251,7 @@ only marked as lower priority.
PRs are marked as targeting a milestone via the Prow
"/milestone" command.
-This is a blocking requirement during code slush and code freeze as
-described above.
+This is a blocking requirement during code freeze as described above.
## Other Required Labels
@@ -294,7 +277,6 @@ of the issue.
- `priority/critical-urgent`: Never automatically move out of a release milestone; continually escalate to contributor and SIG through all available channels.
- considered a release blocking issue
- - code slush: issue owner update frequency: every 3 days
- code freeze: issue owner update frequency: daily
- would require a patch release if left undiscovered until after the minor release.
- `priority/important-soon`: Escalate to the issue owners and SIG owner; move out of milestone after several unsuccessful escalation attempts.