Skip to content

Commit 841cb5c

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #35108 from zylxjtu/latestimage
Revert the test images back to latest
2 parents bf7c405 + 983605e commit 841cb5c

File tree

6 files changed

+25
-32
lines changed

6 files changed

+25
-32
lines changed

‎config/jobs/kubernetes-sigs/sig-windows/release-1.32-windows-presubmits.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ presubmits:
2424
labels:
2525
preset-azure-community: "true"
2626
preset-capz-containerd-1-7-latest: "true"
27-
preset-capz-windows-2022-202503b: "true"
27+
preset-capz-windows-2022: "true"
2828
preset-capz-windows-common-pull: "true"
2929
preset-dind-enabled: "true"
3030
optional: true

‎config/jobs/kubernetes-sigs/sig-windows/release-1.32-windows.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ periodics:
2626
labels:
2727
preset-azure-community: "true"
2828
preset-capz-containerd-1-7-latest: "true"
29-
preset-capz-windows-2022-202503b: "true"
29+
preset-capz-windows-2022: "true"
3030
preset-capz-windows-common: "true"
3131
preset-dind-enabled: "true"
3232
preset-kind-volume-mounts: "true"
@@ -61,7 +61,7 @@ periodics:
6161
preset-capz-containerd-1-7-latest: "true"
6262
preset-capz-serial-slow: "true"
6363
preset-capz-gmsa-setup: "true"
64-
preset-capz-windows-2022-202503b: "true"
64+
preset-capz-windows-2022: "true"
6565
extra_refs:
6666
- org: kubernetes-sigs
6767
repo: cluster-api-provider-azure

‎config/jobs/kubernetes-sigs/sig-windows/release-1.33-windows-presubmits.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ presubmits:
2424
labels:
2525
preset-azure-community: "true"
2626
preset-capz-containerd-1-7-latest: "true"
27-
preset-capz-windows-2022-202503b: "true"
27+
preset-capz-windows-2022: "true"
2828
preset-capz-windows-common-pull: "true"
2929
preset-dind-enabled: "true"
3030
optional: true

‎config/jobs/kubernetes-sigs/sig-windows/release-1.33-windows.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ periodics:
2626
labels:
2727
preset-azure-community: "true"
2828
preset-capz-containerd-1-7-latest: "true"
29-
preset-capz-windows-2022-202503b: "true"
29+
preset-capz-windows-2022: "true"
3030
preset-capz-windows-common: "true"
3131
preset-dind-enabled: "true"
3232
preset-kind-volume-mounts: "true"
@@ -61,7 +61,7 @@ periodics:
6161
preset-capz-containerd-1-7-latest: "true"
6262
preset-capz-serial-slow: "true"
6363
preset-capz-gmsa-setup: "true"
64-
preset-capz-windows-2022-202503b: "true"
64+
preset-capz-windows-2022: "true"
6565
extra_refs:
6666
- org: kubernetes-sigs
6767
repo: cluster-api-provider-azure

‎config/jobs/kubernetes-sigs/sig-windows/release-master-windows-presubmits.yaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ presubmits:
2323
labels:
2424
preset-dind-enabled: "true"
2525
preset-kind-volume-mounts: "true"
26-
preset-capz-windows-2022-202503b: "true"
26+
preset-capz-windows-2022: "true"
2727
preset-capz-containerd-1-7-latest: "true"
2828
preset-capz-windows-common-pull: "true"
2929
preset-azure-community: "true"
@@ -81,7 +81,7 @@ presubmits:
8181
labels:
8282
preset-dind-enabled: "true"
8383
preset-kind-volume-mounts: "true"
84-
preset-capz-windows-2022-202503b: "true"
84+
preset-capz-windows-2022: "true"
8585
preset-capz-containerd-1-7-latest: "true"
8686
preset-capz-windows-common-pull: "true"
8787
preset-azure-community: "true"
@@ -140,7 +140,7 @@ presubmits:
140140
labels:
141141
preset-dind-enabled: "true"
142142
preset-kind-volume-mounts: "true"
143-
preset-capz-windows-2022-202503b: "true"
143+
preset-capz-windows-2022: "true"
144144
preset-capz-containerd-1-7-latest: "true"
145145
preset-capz-windows-common-pull: "true"
146146
preset-azure-community: "true"
@@ -199,7 +199,7 @@ presubmits:
199199
labels:
200200
preset-dind-enabled: "true"
201201
preset-azure-community: "true"
202-
preset-capz-windows-2022-202503b: "true"
202+
preset-capz-windows-2022: "true"
203203
preset-capz-windows-common-pull: "true"
204204
extra_refs:
205205
- org: kubernetes-sigs
@@ -256,7 +256,7 @@ presubmits:
256256
labels:
257257
preset-dind-enabled: "true"
258258
preset-azure-community: "true"
259-
preset-capz-windows-2022-202503b: "true"
259+
preset-capz-windows-2022: "true"
260260
preset-capz-windows-common-pull: "true"
261261
preset-capz-containerd-1-7-latest: "true"
262262
extra_refs:
@@ -320,7 +320,7 @@ presubmits:
320320
preset-kind-volume-mounts: "true"
321321
preset-azure-community: "true"
322322
preset-capz-windows-common: "true"
323-
preset-capz-windows-2022-202503b: "true"
323+
preset-capz-windows-2022: "true"
324324
preset-capz-containerd-1-7-latest: "true"
325325
extra_refs:
326326
- org: kubernetes-sigs
@@ -383,7 +383,7 @@ presubmits:
383383
preset-capz-windows-common: "true"
384384
preset-capz-containerd-1-7-latest: "true"
385385
preset-azure-community: "true"
386-
preset-capz-windows-2022-202503b: "true"
386+
preset-capz-windows-2022: "true"
387387
extra_refs:
388388
- org: kubernetes-sigs
389389
repo: cluster-api-provider-azure
@@ -485,7 +485,7 @@ presubmits:
485485
preset-dind-enabled: "true"
486486
preset-capz-windows-common: "true"
487487
preset-capz-containerd-1-7-latest: "true"
488-
preset-capz-windows-2022-202503b: "true"
488+
preset-capz-windows-2022: "true"
489489
preset-azure-community: "true"
490490
extra_refs:
491491
- org: kubernetes-sigs
@@ -536,7 +536,7 @@ presubmits:
536536
preset-dind-enabled: "true"
537537
preset-capz-windows-common: "true"
538538
preset-capz-containerd-1-7-latest: "true"
539-
preset-capz-windows-2022-202503b: "true"
539+
preset-capz-windows-2022: "true"
540540
preset-azure-community: "true"
541541
extra_refs:
542542
- org: kubernetes-sigs
@@ -590,7 +590,7 @@ presubmits:
590590
preset-azure-community: "true"
591591
preset-capz-windows-common: "true"
592592
preset-capz-containerd-1-7-latest: "true"
593-
preset-capz-windows-2022-202503b: "true"
593+
preset-capz-windows-2022: "true"
594594
extra_refs:
595595
- org: kubernetes-sigs
596596
repo: cluster-api-provider-azure
@@ -647,7 +647,7 @@ presubmits:
647647
preset-azure-community: "true"
648648
preset-capz-windows-common: "true"
649649
preset-capz-containerd-1-7-latest: "true"
650-
preset-capz-windows-2022-202503b: "true"
650+
preset-capz-windows-2022: "true"
651651
extra_refs:
652652
- org: kubernetes-sigs
653653
repo: cluster-api-provider-azure
@@ -706,7 +706,7 @@ presubmits:
706706
preset-azure-community: "true"
707707
preset-capz-containerd-1-7-latest: "true"
708708
preset-capz-windows-common: "true"
709-
preset-capz-windows-2022-202503b: "true"
709+
preset-capz-windows-2022: "true"
710710
extra_refs:
711711
- org: kubernetes
712712
repo: kubernetes

‎config/jobs/kubernetes-sigs/sig-windows/release-master-windows.yaml‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,6 @@ presets:
2626
env:
2727
- name: WINDOWS_SERVER_VERSION
2828
value: "windows-2022"
29-
- labels:
30-
preset-capz-windows-2022-202503b: "true"
31-
env:
32-
- name: WINDOWS_SERVER_VERSION
33-
value: "windows-2022"
34-
- name: IMAGE_VERSION
35-
value: "1.32.3"
3629
- labels:
3730
preset-capz-windows-2025: "true"
3831
env:
@@ -91,7 +84,7 @@ periodics:
9184
preset-dind-enabled: "true"
9285
preset-kind-volume-mounts: "true"
9386
preset-capz-windows-common: "true"
94-
preset-capz-windows-2022-202503b: "true"
87+
preset-capz-windows-2022: "true"
9588
preset-capz-containerd-1-7-latest: "true"
9689
preset-azure-community: "true"
9790
extra_refs:
@@ -145,7 +138,7 @@ periodics:
145138
preset-dind-enabled: "true"
146139
preset-kind-volume-mounts: "true"
147140
preset-capz-windows-common: "true"
148-
preset-capz-windows-2022-202503b: "true"
141+
preset-capz-windows-2022: "true"
149142
preset-capz-containerd-2-0-latest: "true"
150143
preset-azure-community: "true"
151144
extra_refs:
@@ -198,7 +191,7 @@ periodics:
198191
preset-kind-volume-mounts: "true"
199192
preset-azure-community: "true"
200193
preset-capz-windows-common: "true"
201-
preset-capz-windows-2022-202503b: "true"
194+
preset-capz-windows-2022: "true"
202195
preset-capz-containerd-1-7-latest: "true"
203196
preset-capz-serial-slow: "true"
204197
preset-capz-gmsa-setup: "true"
@@ -255,7 +248,7 @@ periodics:
255248
preset-kind-volume-mounts: "true"
256249
preset-azure-community: "true"
257250
preset-capz-windows-common: "true"
258-
preset-capz-windows-2022-202503b: "true"
251+
preset-capz-windows-2022: "true"
259252
preset-capz-containerd-1-7-latest: "true"
260253
preset-capz-serial-slow: "true"
261254
extra_refs:
@@ -309,7 +302,7 @@ periodics:
309302
preset-kind-volume-mounts: "true"
310303
preset-azure-community: "true"
311304
preset-capz-windows-common: "true"
312-
preset-capz-windows-2022-202503b: "true"
305+
preset-capz-windows-2022: "true"
313306
extra_refs:
314307
- org: kubernetes-sigs
315308
repo: cluster-api-provider-azure
@@ -361,7 +354,7 @@ periodics:
361354
preset-kind-volume-mounts: "true"
362355
preset-azure-community: "true"
363356
preset-capz-windows-common: "true"
364-
preset-capz-windows-2022-202503b: "true"
357+
preset-capz-windows-2022: "true"
365358
extra_refs:
366359
- org: kubernetes-sigs
367360
repo: cluster-api-provider-azure
@@ -421,7 +414,7 @@ periodics:
421414
preset-kind-volume-mounts: "true"
422415
preset-azure-community: "true"
423416
preset-capz-windows-common: "true"
424-
preset-capz-windows-2022-202503b: "true"
417+
preset-capz-windows-2022: "true"
425418
preset-capz-containerd-1-7-latest: "true"
426419
extra_refs:
427420
- org: kubernetes-sigs

0 commit comments

Comments
 (0)