Skip to content

Commit 4c52770

Browse files
committed
ci-signal: clarified timing for dropping n-3 release support in setup steps
added post release cleanup step updated post-release clean up + release tracking tasks fix link
1 parent 451c1ba commit 4c52770

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

.github/ISSUE_TEMPLATE/release_tracking.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ Week 18:
6666
* [ ] [Release Lead] Organize release retrospective
6767
* [ ] [Communications Manager] [Change production branch in Netlify to the new release branch](https://github.com/kubernetes-sigs/cluster-api/tree/main/docs/release/role-handbooks/communications#change-production-branch-in-netlify-to-the-new-release-branch)
6868
* [ ] [Communications Manager] [Update clusterctl links in the quickstart](https://github.com/kubernetes-sigs/cluster-api/tree/main/docs/release/role-handbooks/communications#update-clusterctl-links-in-the-quickstart)
69+
* [ ] [CI Manager] [Post-release cleanup](https://github.com/kubernetes-sigs/cluster-api/tree/main/docs/release/role-handbooks/ci-signal#post-release-cleanup)
6970

7071
Continuously:
7172
* [Release lead] [Maintain the GitHub release milestone](https://github.com/kubernetes-sigs/cluster-api/tree/main/docs/release/role-handbooks/release-lead#continuously-maintain-the-github-release-milestone)

docs/release/role-handbooks/ci-signal/README.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
- [Setup jobs and dashboards for a new release branch](#setup-jobs-and-dashboards-for-a-new-release-branch)
1313
- [[Continuously] Monitor CI signal](#continuously-monitor-ci-signal)
1414
- [[Continuously] Reduce the amount of flaky tests](#continuously-reduce-the-amount-of-flaky-tests)
15+
- [Post-release cleanup](#post-release-cleanup)
1516

1617
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
1718

@@ -37,7 +38,7 @@ While we add test coverage for the new release branch we will also drop the test
3738
2. Modify the following at the `release-1.8` branch entry:
3839
* Change intervals (let's use the same as for `release-1.7`).
3940
2. Create a new dashboard for the new branch in: `test-infra/config/testgrids/kubernetes/sig-cluster-lifecycle/config.yaml` (`dashboard_groups` and `dashboards`).
40-
3. Remove old release branches and unused versions from the `cluster-api-prowjob-gen.yaml` file in [test-infra](https://github.com/kubernetes/test-infra/blob/master/config/jobs/kubernetes-sigs/cluster-api/) according to our policy documented in [Support and guarantees](../../../../CONTRIBUTING.md#support-and-guarantees). As we just added `release-1.8`, then we can now drop test coverage for the `release-1.5` branch.
41+
3. Do not remove old release branches during this setup phase.
4142
4. Review the templates and modify/remove any outdated logic in the templates. For example, when `release-1.7` is dropped from support, it can be removed from [this if statement](https://github.com/kubernetes/test-infra/blob/fa895d9f204e912e2bf0bd42221017a6dedf6065/config/jobs/kubernetes-sigs/cluster-api/templates/cluster-api-periodics-upgrades.yaml.tpl#L42).
4243
5. Regenerate the prowjob configuration running `make generate-test-infra-prowjobs` command from cluster-api repository. Before running this command, ensure to export the `TEST_INFRA_DIR` variable, specifying the location of the [test-infra](https://github.com/kubernetes/test-infra/) repository in your environment. For further information, refer to this [link](https://github.com/kubernetes-sigs/cluster-api/pull/9937).
4344

@@ -84,3 +85,11 @@ To reduce the amount of flakes please periodically:
8485
2. Open issues using an appropriate template (flaking-test) for occurring flakes and ideally fix them or find someone who can.
8586

8687
**Note**: Given resource limitations in the Prow cluster it might not be possible to fix all flakes. Let's just try to pragmatically keep the amount of flakes pretty low.
88+
89+
### Post-release cleanup
90+
Once the new minor release (e.g., `v1.8.0`) has been officially cut, perform the following cleanup:
91+
92+
- Remove old release branches and unused versions from the `cluster-api-prowjob-gen.yaml` file in [test-infra](https://github.com/kubernetes/test-infra/blob/master/config/jobs/kubernetes-sigs/cluster-api/) according to our policy documented in [Support and guarantees](../../../book/src/reference/versions.md#cluster-api-release-vs-api-versions)
93+
94+
We can now drop test coverage for branches out of support (e.g. `release-1.5`).
95+

0 commit comments

Comments
 (0)