Skip to content

Commit caa378c

Browse files
authored
Merge pull request kubernetes-sigs#10066 from sbueringer/pr-update-jobs-md
🌱 Update jobs.md and make it version-independent
2 parents 4cbc679 + dced427 commit caa378c

File tree

2 files changed

+36
-64
lines changed

2 files changed

+36
-64
lines changed

.github/ISSUE_TEMPLATE/kubernetes_bump.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ changes should be cherry-picked to all release series that will support the new
5555

5656
* [ ] Update book:
5757
* Update supported versions in `versions.md`
58-
* Update job documentation in `jobs.md`
5958
* Prior art: #9161
6059
* [ ] Issues specific to the Kubernetes minor release:
6160
* Sometimes there are adjustments that we have to make in Cluster API to be able to support

docs/book/src/reference/jobs.md

Lines changed: 36 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -7,33 +7,37 @@ It also documents the cluster-api specific configuration in test-infra.
77

88
> NOTE: To see which test jobs execute which tests or e2e tests, you can click on the links which lead to the respective test overviews in testgrid.
99
10+
The dashboards for the ProwJobs can be found here: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api
11+
12+
More details about ProwJob configurations can be found here: [cluster-api-prowjob-gen.yaml](https://github.com/kubernetes/test-infra/blob/master/config/jobs/kubernetes-sigs/cluster-api/cluster-api-prowjob-gen.yaml)
13+
1014
### Presubmits
1115

1216
Prow Presubmits:
1317
* mandatory for merge, always run:
14-
* [pull-cluster-api-build-main] `./scripts/ci-build.sh`
15-
* [pull-cluster-api-verify-main] `./scripts/ci-verify.sh`
18+
* pull-cluster-api-build-main `./scripts/ci-build.sh`
19+
* pull-cluster-api-verify-main `./scripts/ci-verify.sh`
1620
* mandatory for merge, run if go code changes:
17-
* [pull-cluster-api-test-main] `./scripts/ci-test.sh`
18-
* [pull-cluster-api-e2e-main] `./scripts/ci-e2e.sh`
21+
* pull-cluster-api-test-main `./scripts/ci-test.sh`
22+
* pull-cluster-api-e2e-blocking-main `./scripts/ci-e2e.sh`
1923
* GINKGO_FOCUS: `[PR-Blocking]`
2024
* optional for merge, run if go code changes:
21-
* [pull-cluster-api-apidiff-main] `./scripts/ci-apidiff.sh`
25+
* pull-cluster-api-apidiff-main `./scripts/ci-apidiff.sh`
2226
* mandatory for merge, run if manually triggered:
23-
* [pull-cluster-api-test-mink8s-main] `./scripts/ci-test.sh`
24-
* KUBEBUILDER_ENVTEST_KUBERNETES_VERSION: `1.24.2`
25-
* [pull-cluster-api-e2e-mink8s-main] `./scripts/ci-e2e.sh`
26-
* GINKGO_SKIP: `[Conformance] [K8s-Upgrade]|[IPv6]`
27-
* KUBERNETES_VERSION_MANAGEMENT: `stable-1.24`
28-
* [pull-cluster-api-e2e-full-dualstack-and-ipv6-main] `./scripts/ci-e2e.sh`
27+
* pull-cluster-api-test-mink8s-main `./scripts/ci-test.sh`
28+
* pull-cluster-api-e2e-mink8s-main `./scripts/ci-e2e.sh`
29+
* GINKGO_SKIP: `[Conformance]|[IPv6]`
30+
* pull-cluster-api-e2e-dualstack-and-ipv6-main `./scripts/ci-e2e.sh`
2931
* DOCKER_IN_DOCKER_IPV6_ENABLED: `true`
30-
* GINKGO_SKIP: `[PR-Blocking] [Conformance] [K8s-Upgrade]`
31-
* [pull-cluster-api-e2e-full-main] `./scripts/ci-e2e.sh`
32-
* GINKGO_SKIP: `[PR-Blocking] [Conformance] [K8s-Upgrade]|[IPv6]`
33-
* [pull-cluster-api-e2e-workload-upgrade-1-29-latest-main] `./scripts/ci-e2e.sh` FROM: `stable-1.29` TO: `ci/latest-1.30`
34-
* GINKGO_FOCUS: `[K8s-Upgrade]`
35-
* optional for merge, run if manually triggered:
36-
* [pull-cluster-api-e2e-scale-main-experimental] `./scripts/ci-e2e-scale.sh`
32+
* GINKGO_SKIP: `[Conformance]`
33+
* pull-cluster-api-e2e-main `./scripts/ci-e2e.sh`
34+
* GINKGO_SKIP: `[Conformance]|[IPv6]`
35+
* pull-cluster-api-e2e-upgrade-* `./scripts/ci-e2e.sh`
36+
* GINKGO_FOCUS: `[Conformance] [K8s-Upgrade]`
37+
* pull-cluster-api-e2e-conformance-main `./scripts/ci-e2e.sh`
38+
* GINKGO_FOCUS: `[Conformance] [K8s-Install]`
39+
* pull-cluster-api-e2e-conformance-ci-latest-main `./scripts/ci-e2e.sh`
40+
* GINKGO_FOCUS: `[Conformance] [K8s-Install-ci-latest]`
3741

3842
GitHub Presubmit Workflows:
3943
* PR golangci-lint: golangci/golangci-lint-action
@@ -68,29 +72,21 @@ Prow Postsubmits:
6872
### Periodics
6973

7074
Prow Periodics:
71-
* [periodic-cluster-api-test-main] `./scripts/ci-test.sh`
72-
* [periodic-cluster-api-test-mink8s-main] `./scripts/ci-test.sh`
73-
* KUBEBUILDER_ENVTEST_KUBERNETES_VERSION: `1.24.2`
74-
* [periodic-cluster-api-e2e-main] `./scripts/ci-e2e.sh`
75-
* GINKGO_SKIP: `[Conformance] [K8s-Upgrade]|[IPv6]`
76-
* [periodic-cluster-api-e2e-mink8s-main] `./scripts/ci-e2e.sh`
77-
* GINKGO_SKIP: `[Conformance] [K8s-Upgrade]|[IPv6]`
78-
* KUBERNETES_VERSION_MANAGEMENT: `stable-1.24`
79-
* [periodic-cluster-api-e2e-dualstack-and-ipv6-main] `./scripts/ci-e2e.sh`
75+
* periodic-cluster-api-test-main `./scripts/ci-test.sh`
76+
* periodic-cluster-api-test-mink8s-main `./scripts/ci-test.sh`
77+
* periodic-cluster-api-e2e-main `./scripts/ci-e2e.sh`
78+
* GINKGO_SKIP: `[Conformance]|[IPv6]`
79+
* periodic-cluster-api-e2e-mink8s-main `./scripts/ci-e2e.sh`
80+
* GINKGO_SKIP: `[Conformance]|[IPv6]`
81+
* periodic-cluster-api-e2e-dualstack-and-ipv6-main `./scripts/ci-e2e.sh`
8082
* DOCKER_IN_DOCKER_IPV6_ENABLED: `true`
81-
* GINKGO_SKIP: `[Conformance] [K8s-Upgrade]`
82-
* [periodic-cluster-api-e2e-workload-upgrade-1-24-1-25-main] `./scripts/ci-e2e.sh` FROM: `stable-1.24` TO: `stable-1.25`
83-
* GINKGO_FOCUS: `[K8s-Upgrade]`
84-
* [periodic-cluster-api-e2e-workload-upgrade-1-25-1-26-main] `./scripts/ci-e2e.sh` FROM: `stable-1.25` TO: `stable-1.26`
85-
* GINKGO_FOCUS: `[K8s-Upgrade]`
86-
* [periodic-cluster-api-e2e-workload-upgrade-1-26-1-27-main] `./scripts/ci-e2e.sh` FROM: `stable-1.26` TO: `stable-1.27`
87-
* GINKGO_FOCUS: `[K8s-Upgrade]`
88-
* [periodic-cluster-api-e2e-workload-upgrade-1-27-1-28-main] `./scripts/ci-e2e.sh` FROM: `stable-1.27` TO: `stable-1.28`
89-
* GINKGO_FOCUS: `[K8s-Upgrade]`
90-
* [periodic-cluster-api-e2e-workload-upgrade-1-28-1-29-main] `./scripts/ci-e2e.sh` FROM: `stable-1.28` TO: `stable-1.29`
91-
* GINKGO_FOCUS: `[K8s-Upgrade]`
92-
* [periodic-cluster-api-e2e-workload-upgrade-1-29-latest-main] `./scripts/ci-e2e.sh` FROM: `stable-1.29` TO: `ci/latest-1.30`
93-
* GINKGO_FOCUS: `[K8s-Upgrade]`
83+
* GINKGO_SKIP: `[Conformance]`
84+
* periodic-cluster-api-e2e-upgrade-* `./scripts/ci-e2e.sh`
85+
* GINKGO_FOCUS: `[Conformance] [K8s-Upgrade]`
86+
* periodic-cluster-api-e2e-conformance-main `./scripts/ci-e2e.sh`
87+
* GINKGO_FOCUS: `[Conformance] [K8s-Install]`
88+
* periodic-cluster-api-e2e-conformance-ci-latest-main `./scripts/ci-e2e.sh`
89+
* GINKGO_FOCUS: `[Conformance] [K8s-Install-ci-latest]`
9490
* [cluster-api-push-images-nightly] Google Cloud Build: `make release-staging-nightly`
9591

9692
## Test-infra configuration
@@ -116,28 +112,5 @@ Prow Periodics:
116112

117113

118114
<!-- links -->
119-
[pull-cluster-api-build-main]: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api#capi-pr-build-main
120-
[pull-cluster-api-apidiff-main]: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api#capi-pr-apidiff-main
121-
[pull-cluster-api-verify-main]: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api#capi-pr-verify-main
122-
[pull-cluster-api-test-main]: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api#capi-pr-test-main
123-
[pull-cluster-api-test-mink8s-main]: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api#capi-pr-test-mink8s-main
124-
[pull-cluster-api-e2e-mink8s-main]: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api#capi-pr-e2e-mink8s-main
125-
[pull-cluster-api-e2e-main]: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api#capi-pr-e2e-main
126-
[pull-cluster-api-e2e-informing-main]: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api#capi-pr-e2e-informing-main
127-
[pull-cluster-api-e2e-full-dualstack-and-ipv6-main]: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api#capi-pr-e2e-full-dualstack-and-ipv6-main
128-
[pull-cluster-api-e2e-full-main]: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api#capi-pr-e2e-full-main
129-
[pull-cluster-api-e2e-workload-upgrade-1-29-latest-main]: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api#capi-pr-e2e-main-1-29-latest
130-
[pull-cluster-api-e2e-scale-main-experimental]: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api#capi-pr-e2e-scale-main-experimental
131-
[periodic-cluster-api-test-main]: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api#capi-test-main
132-
[periodic-cluster-api-test-mink8s-main]: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api#capi-test-mink8s-main
133-
[periodic-cluster-api-e2e-main]: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api#capi-e2e-main
134-
[periodic-cluster-api-e2e-mink8s-main]: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api#capi-e2e-mink8s-main
135-
[periodic-cluster-api-e2e-dualstack-and-ipv6-main]: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api#capi-e2e-dualstack-and-ipv6-main
136-
[periodic-cluster-api-e2e-workload-upgrade-1-24-1-25-main]: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api#capi-e2e-main-1-24-1-25
137-
[periodic-cluster-api-e2e-workload-upgrade-1-25-1-26-main]: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api#capi-e2e-main-1-25-1-26
138-
[periodic-cluster-api-e2e-workload-upgrade-1-26-1-27-main]: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api#capi-e2e-main-1-26-1-27
139-
[periodic-cluster-api-e2e-workload-upgrade-1-27-1-28-main]: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api#capi-e2e-main-1-27-1-28
140-
[periodic-cluster-api-e2e-workload-upgrade-1-28-1-29-main]: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api#capi-e2e-main-1-28-1-29
141-
[periodic-cluster-api-e2e-workload-upgrade-1-29-latest-main]: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api#capi-e2e-main-1-29-latest
142115
[cluster-api-push-images-nightly]: https://testgrid.k8s.io/sig-cluster-lifecycle-image-pushes#cluster-api-push-images-nightly
143116
[post-cluster-api-push-images]: https://testgrid.k8s.io/sig-cluster-lifecycle-image-pushes#post-cluster-api-push-images

0 commit comments

Comments
 (0)