Skip to content

Commit b4ba945

Browse files
committed
capv: set the right cluster
1 parent a3a2772 commit b4ba945

File tree

4 files changed

+17
-2
lines changed

4 files changed

+17
-2
lines changed

config/jobs/kubernetes-sigs/cluster-api-provider-vsphere/templates/cluster-api-provider-vsphere-periodics-kubetest.yaml.tpl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ periodics:
33

44
# original job: https://github.com/kubernetes/test-infra/blob/92927d1abec1c3c78e396356e1bbaf19f9e2b699/config/jobs/kubernetes/sig-cloud-provider/gcp/gcp-gce.yaml#L713
55
- name: periodic-cluster-api-provider-vsphere-e2e-exp-kk-alpha-features
6+
cluster: k8s-infra-prow-build
67
labels:
78
preset-dind-enabled: "true"
89
preset-gcve-e2e-config: "true"
@@ -59,6 +60,7 @@ periodics:
5960

6061
# original jobs: https://github.com/kubernetes/test-infra/blob/92927d1abec1c3c78e396356e1bbaf19f9e2b699/config/jobs/kubernetes/sig-cloud-provider/gcp/gcp-gce.yaml#L857
6162
- name: periodic-cluster-api-provider-vsphere-e2e-exp-kk-serial
63+
cluster: k8s-infra-prow-build
6264
labels:
6365
preset-dind-enabled: "true"
6466
preset-gcve-e2e-config: "true"
@@ -115,6 +117,7 @@ periodics:
115117

116118
# original job: https://github.com/kubernetes/test-infra/blob/92927d1abec1c3c78e396356e1bbaf19f9e2b699/config/jobs/kubernetes/sig-cloud-provider/gcp/gcp-gce.yaml#L896
117119
- name: periodic-cluster-api-provider-vsphere-e2e-exp-kk-slow
120+
cluster: k8s-infra-prow-build
118121
labels:
119122
preset-dind-enabled: "true"
120123
preset-gcve-e2e-config: "true"
@@ -171,6 +174,7 @@ periodics:
171174

172175
# original job: https://github.com/kubernetes/test-infra/blob/92927d1abec1c3c78e396356e1bbaf19f9e2b699/config/jobs/kubernetes/sig-cloud-provider/gcp/gcp-gce.yaml#L581
173176
- name: periodic-cluster-api-provider-vsphere-e2e-exp-kk
177+
cluster: k8s-infra-prow-build
174178
labels:
175179
preset-dind-enabled: "true"
176180
preset-gcve-e2e-config: "true"

config/jobs/kubernetes-sigs/cluster-api-provider-vsphere/templates/cluster-api-provider-vsphere-periodics-upgrades.yaml.tpl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ periodics:
1010
{{ end -}}
1111
{{- range $_, $upgrade := $.config.Upgrades }}
1212
- name: periodic-cluster-api-provider-vsphere-e2e-{{ $mode }}-upgrade-{{ ReplaceAll (TrimPrefix (TrimPrefix $upgrade.From "stable-") "ci/latest-") "." "-" }}-{{ ReplaceAll (TrimPrefix (TrimPrefix $upgrade.To "stable-") "ci/latest-") "." "-" }}-{{ ReplaceAll $.branch "." "-" }}
13+
cluster: k8s-infra-prow-build
1314
cron: {{ $cron }}
1415
decorate: true
1516
decoration_config:

config/jobs/kubernetes-sigs/cluster-api-provider-vsphere/templates/cluster-api-provider-vsphere-periodics.yaml.tpl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ periodics:
4343
{{ $cron := "'0 0 * * *'" -}}
4444
{{ if eq $mode "supervisor" }}{{ $cron = "'0 3 * * *'" }}{{ end -}}
4545
- name: periodic-cluster-api-provider-vsphere-e2e-{{ $mode }}-{{ ReplaceAll $.branch "." "-" }}
46+
cluster: k8s-infra-prow-build
4647
labels:
4748
preset-dind-enabled: "true"
4849
preset-gcve-e2e-config: "true"
@@ -152,6 +153,7 @@ periodics:
152153
testgrid-num-failures-to-alert: "4"
153154
description: Runs all e2e tests
154155
- name: periodic-cluster-api-provider-vsphere-e2e-{{ $mode }}-conformance-{{ ReplaceAll $.branch "." "-" }}
156+
cluster: k8s-infra-prow-build
155157
labels:
156158
preset-dind-enabled: "true"
157159
preset-gcve-e2e-config: "true"
@@ -202,6 +204,7 @@ periodics:
202204
testgrid-num-failures-to-alert: "4"
203205
description: Runs conformance tests for CAPV
204206
- name: periodic-cluster-api-provider-vsphere-e2e-{{ $mode }}-conformance-ci-latest-{{ ReplaceAll $.branch "." "-" }}
207+
cluster: k8s-infra-prow-build
205208
labels:
206209
preset-dind-enabled: "true"
207210
preset-gcve-e2e-config: "true"
@@ -309,9 +312,10 @@ periodics:
309312
description: Shows test coverage for CAPV
310313

311314
- name: periodic-cluster-api-provider-vsphere-janitor
315+
cluster: k8s-infra-prow-build
312316
labels:
313317
preset-dind-enabled: "true"
314-
preset-cluster-api-provider-vsphere-janitor-config: "true"
318+
preset-gcve-e2e-config: "true"
315319
interval: 12h
316320
decorate: true
317321
decoration_config:

config/jobs/kubernetes-sigs/cluster-api-provider-vsphere/templates/cluster-api-provider-vsphere-presubmits.yaml.tpl

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ presubmits:
9999
{{ $modeFocus := "" -}}
100100
{{ if eq $mode "supervisor" }}{{ $modeFocus = "\\\\[supervisor\\\\] " }}{{ end }}
101101
- name: pull-cluster-api-provider-vsphere-e2e-{{ $mode }}-blocking-{{ ReplaceAll $.branch "." "-" }}
102+
cluster: k8s-infra-prow-build
102103
branches:
103104
- ^{{ $.branch }}$
104105
labels:
@@ -145,6 +146,7 @@ presubmits:
145146
testgrid-tab-name: pr-e2e-{{ $mode }}-blocking-{{ ReplaceAll $.branch "." "-" }}
146147
description: Runs only PR Blocking e2e tests
147148
- name: pull-cluster-api-provider-vsphere-e2e-{{ $mode }}-{{ ReplaceAll $.branch "." "-" }}
149+
cluster: k8s-infra-prow-build
148150
branches:
149151
- ^{{ $.branch }}$
150152
labels:
@@ -243,6 +245,7 @@ presubmits:
243245
testgrid-tab-name: pr-e2e-vcsim-{{ $mode }}-{{ ReplaceAll $.branch "." "-" }}
244246
description: Runs e2e tests with vcsim / govmomi mode
245247
- name: pull-cluster-api-provider-vsphere-e2e-{{ $mode }}-upgrade-{{ ReplaceAll (last $.config.Upgrades).From "." "-" }}-{{ ReplaceAll (last $.config.Upgrades).To "." "-" }}-{{ ReplaceAll $.branch "." "-" }}
248+
cluster: k8s-infra-prow-build
246249
labels:
247250
preset-dind-enabled: "true"
248251
preset-gcve-e2e-config: "true"
@@ -290,6 +293,7 @@ presubmits:
290293
testgrid-dashboards: vmware-cluster-api-provider-vsphere, sig-cluster-lifecycle-cluster-api-provider-vsphere
291294
testgrid-tab-name: pr-e2e-{{ $mode }}-{{ ReplaceAll $.branch "." "-" }}-{{ ReplaceAll (last $.config.Upgrades).From "." "-" }}-{{ ReplaceAll (last $.config.Upgrades).To "." "-" }}
292295
- name: pull-cluster-api-provider-vsphere-e2e-{{ $mode }}-conformance-{{ ReplaceAll $.branch "." "-" }}
296+
cluster: k8s-infra-prow-build
293297
branches:
294298
- ^{{ $.branch }}$
295299
labels:
@@ -334,6 +338,7 @@ presubmits:
334338
testgrid-tab-name: pr-e2e-{{ $mode }}-conformance-{{ ReplaceAll $.branch "." "-" }}
335339
description: Runs conformance tests for CAPV
336340
- name: pull-cluster-api-provider-vsphere-e2e-{{ $mode }}-conformance-ci-latest-{{ ReplaceAll $.branch "." "-" }}
341+
cluster: k8s-infra-prow-build
337342
branches:
338343
- ^{{ $.branch }}$
339344
labels:
@@ -380,9 +385,10 @@ presubmits:
380385
{{ end -}}
381386
{{- if eq $.branch "main" }}
382387
- name: pull-cluster-api-provider-vsphere-janitor-main
388+
cluster: k8s-infra-prow-build
383389
labels:
384390
preset-dind-enabled: "true"
385-
preset-cluster-api-provider-vsphere-janitor-config: "true"
391+
preset-gcve-e2e-config: "true"
386392
always_run: false
387393
optional: true
388394
decorate: true

0 commit comments

Comments
 (0)