Skip to content

Commit 71bd2b0

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #35137 from gnufied/fix-gen-job-csi-e2e
Start defaulting csi-e2e version for all sidecars
2 parents 79ff445 + 094cecf commit 71bd2b0

File tree

11 files changed

+94
-16
lines changed

11 files changed

+94
-16
lines changed

‎config/jobs/kubernetes-csi/csi-driver-host-path/csi-driver-host-path-config.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ presubmits:
3535
value: "1.31.0"
3636
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
3737
value: "1.31"
38+
- name: CSI_PROW_E2E_VERSION
39+
value: "release-1.31"
3840
- name: CSI_PROW_DEPLOYMENT_SUFFIX
3941
value: ""
4042
- name: CSI_PROW_DRIVER_VERSION
@@ -132,6 +134,8 @@ presubmits:
132134
value: "1.32.0"
133135
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
134136
value: "1.32"
137+
- name: CSI_PROW_E2E_VERSION
138+
value: "release-1.32"
135139
- name: CSI_PROW_DEPLOYMENT_SUFFIX
136140
value: ""
137141
- name: CSI_PROW_DRIVER_VERSION
@@ -229,6 +233,8 @@ presubmits:
229233
value: "1.33.0"
230234
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
231235
value: "1.33"
236+
- name: CSI_PROW_E2E_VERSION
237+
value: "release-1.33"
232238
- name: CSI_PROW_DEPLOYMENT_SUFFIX
233239
value: ""
234240
- name: CSI_PROW_DRIVER_VERSION
@@ -326,6 +332,8 @@ presubmits:
326332
value: "1.32.0"
327333
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
328334
value: "1.32"
335+
- name: CSI_PROW_E2E_VERSION
336+
value: "release-1.32"
329337
- name: CSI_PROW_DEPLOYMENT_SUFFIX
330338
value: ""
331339
- name: CSI_PROW_DRIVER_VERSION
@@ -377,6 +385,8 @@ presubmits:
377385
value: "1.31.0"
378386
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
379387
value: "1.31"
388+
- name: CSI_PROW_E2E_VERSION
389+
value: "release-1.31"
380390
- name: CSI_PROW_DEPLOYMENT_SUFFIX
381391
value: "-test"
382392
- name: CSI_PROW_DRIVER_VERSION
@@ -474,6 +484,8 @@ presubmits:
474484
value: "1.32.0"
475485
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
476486
value: "1.32"
487+
- name: CSI_PROW_E2E_VERSION
488+
value: "release-1.32"
477489
- name: CSI_PROW_DEPLOYMENT_SUFFIX
478490
value: "-test"
479491
- name: CSI_PROW_DRIVER_VERSION
@@ -571,6 +583,8 @@ presubmits:
571583
value: "1.33.0"
572584
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
573585
value: "1.33"
586+
- name: CSI_PROW_E2E_VERSION
587+
value: "release-1.33"
574588
- name: CSI_PROW_DEPLOYMENT_SUFFIX
575589
value: "-test"
576590
- name: CSI_PROW_DRIVER_VERSION
@@ -668,6 +682,8 @@ presubmits:
668682
value: "1.32.0"
669683
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
670684
value: "1.32"
685+
- name: CSI_PROW_E2E_VERSION
686+
value: "release-1.32"
671687
- name: CSI_PROW_DEPLOYMENT_SUFFIX
672688
value: "-test"
673689
- name: CSI_PROW_DRIVER_VERSION

‎config/jobs/kubernetes-csi/external-attacher/external-attacher-config.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ presubmits:
3535
value: "1.31.0"
3636
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
3737
value: "1.31"
38+
- name: CSI_PROW_E2E_VERSION
39+
value: "release-1.31"
3840
- name: CSI_PROW_DEPLOYMENT_SUFFIX
3941
value: ""
4042
- name: CSI_PROW_DRIVER_VERSION
@@ -132,6 +134,8 @@ presubmits:
132134
value: "1.32.0"
133135
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
134136
value: "1.32"
137+
- name: CSI_PROW_E2E_VERSION
138+
value: "release-1.32"
135139
- name: CSI_PROW_DEPLOYMENT_SUFFIX
136140
value: ""
137141
- name: CSI_PROW_DRIVER_VERSION
@@ -229,6 +233,8 @@ presubmits:
229233
value: "1.33.0"
230234
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
231235
value: "1.33"
236+
- name: CSI_PROW_E2E_VERSION
237+
value: "release-1.33"
232238
- name: CSI_PROW_DEPLOYMENT_SUFFIX
233239
value: ""
234240
- name: CSI_PROW_DRIVER_VERSION
@@ -326,6 +332,8 @@ presubmits:
326332
value: "1.32.0"
327333
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
328334
value: "1.32"
335+
- name: CSI_PROW_E2E_VERSION
336+
value: "release-1.32"
329337
- name: CSI_PROW_DEPLOYMENT_SUFFIX
330338
value: ""
331339
- name: CSI_PROW_DRIVER_VERSION

‎config/jobs/kubernetes-csi/external-provisioner/external-provisioner-config.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ presubmits:
3535
value: "1.31.0"
3636
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
3737
value: "1.31"
38+
- name: CSI_PROW_E2E_VERSION
39+
value: "release-1.31"
3840
- name: CSI_PROW_DEPLOYMENT_SUFFIX
3941
value: ""
4042
- name: CSI_PROW_DRIVER_VERSION
@@ -132,6 +134,8 @@ presubmits:
132134
value: "1.32.0"
133135
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
134136
value: "1.32"
137+
- name: CSI_PROW_E2E_VERSION
138+
value: "release-1.32"
135139
- name: CSI_PROW_DEPLOYMENT_SUFFIX
136140
value: ""
137141
- name: CSI_PROW_DRIVER_VERSION
@@ -229,6 +233,8 @@ presubmits:
229233
value: "1.33.0"
230234
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
231235
value: "1.33"
236+
- name: CSI_PROW_E2E_VERSION
237+
value: "release-1.33"
232238
- name: CSI_PROW_DEPLOYMENT_SUFFIX
233239
value: ""
234240
- name: CSI_PROW_DRIVER_VERSION
@@ -326,6 +332,8 @@ presubmits:
326332
value: "1.32.0"
327333
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
328334
value: "1.32"
335+
- name: CSI_PROW_E2E_VERSION
336+
value: "release-1.32"
329337
- name: CSI_PROW_DEPLOYMENT_SUFFIX
330338
value: ""
331339
- name: CSI_PROW_DRIVER_VERSION

‎config/jobs/kubernetes-csi/external-resizer/external-resizer-config.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ presubmits:
3535
value: "1.31.0"
3636
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
3737
value: "1.31"
38+
- name: CSI_PROW_E2E_VERSION
39+
value: "release-1.31"
3840
- name: CSI_PROW_DEPLOYMENT_SUFFIX
3941
value: ""
4042
- name: CSI_PROW_DRIVER_VERSION
@@ -132,6 +134,8 @@ presubmits:
132134
value: "1.32.0"
133135
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
134136
value: "1.32"
137+
- name: CSI_PROW_E2E_VERSION
138+
value: "release-1.32"
135139
- name: CSI_PROW_DEPLOYMENT_SUFFIX
136140
value: ""
137141
- name: CSI_PROW_DRIVER_VERSION
@@ -229,6 +233,8 @@ presubmits:
229233
value: "1.33.0"
230234
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
231235
value: "1.33"
236+
- name: CSI_PROW_E2E_VERSION
237+
value: "release-1.33"
232238
- name: CSI_PROW_DEPLOYMENT_SUFFIX
233239
value: ""
234240
- name: CSI_PROW_DRIVER_VERSION
@@ -326,6 +332,8 @@ presubmits:
326332
value: "1.32.0"
327333
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
328334
value: "1.32"
335+
- name: CSI_PROW_E2E_VERSION
336+
value: "release-1.32"
329337
- name: CSI_PROW_DEPLOYMENT_SUFFIX
330338
value: ""
331339
- name: CSI_PROW_DRIVER_VERSION

‎config/jobs/kubernetes-csi/external-snapshot-metadata/external-snapshot-metadata-config.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ presubmits:
3535
value: "1.31.0"
3636
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
3737
value: "1.31"
38+
- name: CSI_PROW_E2E_VERSION
39+
value: "release-1.31"
3840
- name: CSI_PROW_DEPLOYMENT_SUFFIX
3941
value: ""
4042
- name: CSI_PROW_DRIVER_VERSION
@@ -132,6 +134,8 @@ presubmits:
132134
value: "1.32.0"
133135
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
134136
value: "1.32"
137+
- name: CSI_PROW_E2E_VERSION
138+
value: "release-1.32"
135139
- name: CSI_PROW_DEPLOYMENT_SUFFIX
136140
value: ""
137141
- name: CSI_PROW_DRIVER_VERSION
@@ -229,6 +233,8 @@ presubmits:
229233
value: "1.33.0"
230234
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
231235
value: "1.33"
236+
- name: CSI_PROW_E2E_VERSION
237+
value: "release-1.33"
232238
- name: CSI_PROW_DEPLOYMENT_SUFFIX
233239
value: ""
234240
- name: CSI_PROW_DRIVER_VERSION
@@ -326,6 +332,8 @@ presubmits:
326332
value: "1.32.0"
327333
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
328334
value: "1.32"
335+
- name: CSI_PROW_E2E_VERSION
336+
value: "release-1.32"
329337
- name: CSI_PROW_DEPLOYMENT_SUFFIX
330338
value: ""
331339
- name: CSI_PROW_DRIVER_VERSION

‎config/jobs/kubernetes-csi/external-snapshotter/external-snapshotter-config.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ presubmits:
3535
value: "1.31.0"
3636
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
3737
value: "1.31"
38-
- name: CSI_PROW_DEPLOYMENT_SUFFIX
39-
value: ""
4038
- name: CSI_PROW_E2E_VERSION
4139
value: "release-1.31"
40+
- name: CSI_PROW_DEPLOYMENT_SUFFIX
41+
value: ""
4242
- name: CSI_PROW_DRIVER_VERSION
4343
value: "v1.17.0"
4444
- name: CSI_SNAPSHOTTER_VERSION
@@ -233,6 +233,8 @@ presubmits:
233233
value: "1.33.0"
234234
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
235235
value: "1.33"
236+
- name: CSI_PROW_E2E_VERSION
237+
value: "release-1.33"
236238
- name: CSI_PROW_DEPLOYMENT_SUFFIX
237239
value: ""
238240
- name: CSI_PROW_DRIVER_VERSION

‎config/jobs/kubernetes-csi/gen-jobs.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -396,6 +396,8 @@ EOF
396396
value: "$kubernetes.0"
397397
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
398398
value: "$deployment"
399+
- name: CSI_PROW_E2E_VERSION
400+
value: "release-$deployment"
399401
- name: CSI_PROW_DEPLOYMENT_SUFFIX
400402
value: "$deployment_suffix"
401403
- name: CSI_PROW_DRIVER_VERSION

‎config/jobs/kubernetes-csi/lib-volume-populator/lib-volume-populator-config.yaml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,10 @@ presubmits:
3333
# by periodic jobs (see https://testgrid.k8s.io/sig-storage-csi-ci#Summary).
3434
- name: CSI_PROW_KUBERNETES_VERSION
3535
value: "1.31.0"
36-
# Use K8s 1.33+ e2e test version: https://github.com/kubernetes-csi/lib-volume-populator/issues/221
37-
- name: CSI_PROW_E2E_VERSION
38-
value: "v1.33.0"
3936
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
4037
value: "1.31"
38+
- name: CSI_PROW_E2E_VERSION
39+
value: "release-1.31"
4140
- name: CSI_PROW_DEPLOYMENT_SUFFIX
4241
value: ""
4342
- name: CSI_PROW_DRIVER_VERSION
@@ -61,7 +60,7 @@ presubmits:
6160
# This cannot be enabled by default because there's always the risk
6261
# that something changes in master which breaks the pre-merge check.
6362
cluster: eks-prow-build-cluster
64-
always_run: true
63+
always_run: false
6564
optional: true
6665
decorate: true
6766
skip_report: false
@@ -133,11 +132,10 @@ presubmits:
133132
# by periodic jobs (see https://testgrid.k8s.io/sig-storage-csi-ci#Summary).
134133
- name: CSI_PROW_KUBERNETES_VERSION
135134
value: "1.32.0"
136-
# Use K8s 1.33+ e2e test version: https://github.com/kubernetes-csi/lib-volume-populator/issues/221
137-
- name: CSI_PROW_E2E_VERSION
138-
value: "v1.33.0"
139135
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
140136
value: "1.32"
137+
- name: CSI_PROW_E2E_VERSION
138+
value: "release-1.32"
141139
- name: CSI_PROW_DEPLOYMENT_SUFFIX
142140
value: ""
143141
- name: CSI_PROW_DRIVER_VERSION
@@ -161,7 +159,7 @@ presubmits:
161159
# This cannot be enabled by default because there's always the risk
162160
# that something changes in master which breaks the pre-merge check.
163161
cluster: eks-prow-build-cluster
164-
always_run: true
162+
always_run: false
165163
optional: true
166164
decorate: true
167165
skip_report: false
@@ -235,6 +233,8 @@ presubmits:
235233
value: "1.33.0"
236234
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
237235
value: "1.33"
236+
- name: CSI_PROW_E2E_VERSION
237+
value: "release-1.33"
238238
- name: CSI_PROW_DEPLOYMENT_SUFFIX
239239
value: ""
240240
- name: CSI_PROW_DRIVER_VERSION
@@ -258,7 +258,7 @@ presubmits:
258258
# This cannot be enabled by default because there's always the risk
259259
# that something changes in master which breaks the pre-merge check.
260260
cluster: eks-prow-build-cluster
261-
always_run: true
261+
always_run: false
262262
optional: true
263263
decorate: true
264264
skip_report: false
@@ -301,7 +301,7 @@ presubmits:
301301
cpu: 4
302302
- name: pull-kubernetes-csi-lib-volume-populator-alpha-1-32-on-kubernetes-1-32
303303
cluster: eks-prow-build-cluster
304-
always_run: true
304+
always_run: false
305305
optional: true
306306
decorate: true
307307
skip_report: false
@@ -332,6 +332,8 @@ presubmits:
332332
value: "1.32.0"
333333
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
334334
value: "1.32"
335+
- name: CSI_PROW_E2E_VERSION
336+
value: "release-1.32"
335337
- name: CSI_PROW_DEPLOYMENT_SUFFIX
336338
value: ""
337339
- name: CSI_PROW_DRIVER_VERSION

‎config/jobs/kubernetes-csi/livenessprobe/livenessprobe-config.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ presubmits:
3535
value: "1.31.0"
3636
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
3737
value: "1.31"
38+
- name: CSI_PROW_E2E_VERSION
39+
value: "release-1.31"
3840
- name: CSI_PROW_DEPLOYMENT_SUFFIX
3941
value: ""
4042
- name: CSI_PROW_DRIVER_VERSION
@@ -132,6 +134,8 @@ presubmits:
132134
value: "1.32.0"
133135
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
134136
value: "1.32"
137+
- name: CSI_PROW_E2E_VERSION
138+
value: "release-1.32"
135139
- name: CSI_PROW_DEPLOYMENT_SUFFIX
136140
value: ""
137141
- name: CSI_PROW_DRIVER_VERSION
@@ -229,6 +233,8 @@ presubmits:
229233
value: "1.33.0"
230234
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
231235
value: "1.33"
236+
- name: CSI_PROW_E2E_VERSION
237+
value: "release-1.33"
232238
- name: CSI_PROW_DEPLOYMENT_SUFFIX
233239
value: ""
234240
- name: CSI_PROW_DRIVER_VERSION
@@ -326,6 +332,8 @@ presubmits:
326332
value: "1.32.0"
327333
- name: CSI_PROW_KUBERNETES_DEPLOYMENT
328334
value: "1.32"
335+
- name: CSI_PROW_E2E_VERSION
336+
value: "release-1.32"
329337
- name: CSI_PROW_DEPLOYMENT_SUFFIX
330338
value: ""
331339
- name: CSI_PROW_DRIVER_VERSION

0 commit comments

Comments
 (0)