diff --git a/config/jobs/kubernetes-csi/csi-driver-host-path/csi-driver-host-path-config.yaml b/config/jobs/kubernetes-csi/csi-driver-host-path/csi-driver-host-path-config.yaml index c9858b918b0a..36e2612dc470 100644 --- a/config/jobs/kubernetes-csi/csi-driver-host-path/csi-driver-host-path-config.yaml +++ b/config/jobs/kubernetes-csi/csi-driver-host-path/csi-driver-host-path-config.yaml @@ -35,6 +35,8 @@ presubmits: value: "1.31.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT value: "1.31" + - name: CSI_PROW_E2E_VERSION + value: "release-1.31" - name: CSI_PROW_DEPLOYMENT_SUFFIX value: "" - name: CSI_PROW_DRIVER_VERSION @@ -132,6 +134,8 @@ presubmits: value: "1.32.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT value: "1.32" + - name: CSI_PROW_E2E_VERSION + value: "release-1.32" - name: CSI_PROW_DEPLOYMENT_SUFFIX value: "" - name: CSI_PROW_DRIVER_VERSION @@ -229,6 +233,8 @@ presubmits: value: "1.33.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT value: "1.33" + - name: CSI_PROW_E2E_VERSION + value: "release-1.33" - name: CSI_PROW_DEPLOYMENT_SUFFIX value: "" - name: CSI_PROW_DRIVER_VERSION @@ -326,6 +332,8 @@ presubmits: value: "1.32.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT value: "1.32" + - name: CSI_PROW_E2E_VERSION + value: "release-1.32" - name: CSI_PROW_DEPLOYMENT_SUFFIX value: "" - name: CSI_PROW_DRIVER_VERSION @@ -377,6 +385,8 @@ presubmits: value: "1.31.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT value: "1.31" + - name: CSI_PROW_E2E_VERSION + value: "release-1.31" - name: CSI_PROW_DEPLOYMENT_SUFFIX value: "-test" - name: CSI_PROW_DRIVER_VERSION @@ -474,6 +484,8 @@ presubmits: value: "1.32.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT value: "1.32" + - name: CSI_PROW_E2E_VERSION + value: "release-1.32" - name: CSI_PROW_DEPLOYMENT_SUFFIX value: "-test" - name: CSI_PROW_DRIVER_VERSION @@ -571,6 +583,8 @@ presubmits: value: "1.33.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT value: "1.33" + - name: CSI_PROW_E2E_VERSION + value: "release-1.33" - name: CSI_PROW_DEPLOYMENT_SUFFIX value: "-test" - name: CSI_PROW_DRIVER_VERSION @@ -668,6 +682,8 @@ presubmits: value: "1.32.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT value: "1.32" + - name: CSI_PROW_E2E_VERSION + value: "release-1.32" - name: CSI_PROW_DEPLOYMENT_SUFFIX value: "-test" - name: CSI_PROW_DRIVER_VERSION diff --git a/config/jobs/kubernetes-csi/external-attacher/external-attacher-config.yaml b/config/jobs/kubernetes-csi/external-attacher/external-attacher-config.yaml index a50414c2687f..da2205834b31 100644 --- a/config/jobs/kubernetes-csi/external-attacher/external-attacher-config.yaml +++ b/config/jobs/kubernetes-csi/external-attacher/external-attacher-config.yaml @@ -35,6 +35,8 @@ presubmits: value: "1.31.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT value: "1.31" + - name: CSI_PROW_E2E_VERSION + value: "release-1.31" - name: CSI_PROW_DEPLOYMENT_SUFFIX value: "" - name: CSI_PROW_DRIVER_VERSION @@ -132,6 +134,8 @@ presubmits: value: "1.32.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT value: "1.32" + - name: CSI_PROW_E2E_VERSION + value: "release-1.32" - name: CSI_PROW_DEPLOYMENT_SUFFIX value: "" - name: CSI_PROW_DRIVER_VERSION @@ -229,6 +233,8 @@ presubmits: value: "1.33.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT value: "1.33" + - name: CSI_PROW_E2E_VERSION + value: "release-1.33" - name: CSI_PROW_DEPLOYMENT_SUFFIX value: "" - name: CSI_PROW_DRIVER_VERSION @@ -326,6 +332,8 @@ presubmits: value: "1.32.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT value: "1.32" + - name: CSI_PROW_E2E_VERSION + value: "release-1.32" - name: CSI_PROW_DEPLOYMENT_SUFFIX value: "" - name: CSI_PROW_DRIVER_VERSION diff --git a/config/jobs/kubernetes-csi/external-provisioner/external-provisioner-config.yaml b/config/jobs/kubernetes-csi/external-provisioner/external-provisioner-config.yaml index 20a7e71573b0..ec285d38d19b 100644 --- a/config/jobs/kubernetes-csi/external-provisioner/external-provisioner-config.yaml +++ b/config/jobs/kubernetes-csi/external-provisioner/external-provisioner-config.yaml @@ -35,6 +35,8 @@ presubmits: value: "1.31.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT value: "1.31" + - name: CSI_PROW_E2E_VERSION + value: "release-1.31" - name: CSI_PROW_DEPLOYMENT_SUFFIX value: "" - name: CSI_PROW_DRIVER_VERSION @@ -132,6 +134,8 @@ presubmits: value: "1.32.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT value: "1.32" + - name: CSI_PROW_E2E_VERSION + value: "release-1.32" - name: CSI_PROW_DEPLOYMENT_SUFFIX value: "" - name: CSI_PROW_DRIVER_VERSION @@ -229,6 +233,8 @@ presubmits: value: "1.33.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT value: "1.33" + - name: CSI_PROW_E2E_VERSION + value: "release-1.33" - name: CSI_PROW_DEPLOYMENT_SUFFIX value: "" - name: CSI_PROW_DRIVER_VERSION @@ -326,6 +332,8 @@ presubmits: value: "1.32.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT value: "1.32" + - name: CSI_PROW_E2E_VERSION + value: "release-1.32" - name: CSI_PROW_DEPLOYMENT_SUFFIX value: "" - name: CSI_PROW_DRIVER_VERSION diff --git a/config/jobs/kubernetes-csi/external-resizer/external-resizer-config.yaml b/config/jobs/kubernetes-csi/external-resizer/external-resizer-config.yaml index 8b4ec9f8f96f..5244ca2cfeaa 100644 --- a/config/jobs/kubernetes-csi/external-resizer/external-resizer-config.yaml +++ b/config/jobs/kubernetes-csi/external-resizer/external-resizer-config.yaml @@ -35,6 +35,8 @@ presubmits: value: "1.31.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT value: "1.31" + - name: CSI_PROW_E2E_VERSION + value: "release-1.31" - name: CSI_PROW_DEPLOYMENT_SUFFIX value: "" - name: CSI_PROW_DRIVER_VERSION @@ -132,6 +134,8 @@ presubmits: value: "1.32.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT value: "1.32" + - name: CSI_PROW_E2E_VERSION + value: "release-1.32" - name: CSI_PROW_DEPLOYMENT_SUFFIX value: "" - name: CSI_PROW_DRIVER_VERSION @@ -229,6 +233,8 @@ presubmits: value: "1.33.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT value: "1.33" + - name: CSI_PROW_E2E_VERSION + value: "release-1.33" - name: CSI_PROW_DEPLOYMENT_SUFFIX value: "" - name: CSI_PROW_DRIVER_VERSION @@ -326,6 +332,8 @@ presubmits: value: "1.32.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT value: "1.32" + - name: CSI_PROW_E2E_VERSION + value: "release-1.32" - name: CSI_PROW_DEPLOYMENT_SUFFIX value: "" - name: CSI_PROW_DRIVER_VERSION diff --git a/config/jobs/kubernetes-csi/external-snapshot-metadata/external-snapshot-metadata-config.yaml b/config/jobs/kubernetes-csi/external-snapshot-metadata/external-snapshot-metadata-config.yaml index 688a0926b67b..a9ed07b239c6 100644 --- a/config/jobs/kubernetes-csi/external-snapshot-metadata/external-snapshot-metadata-config.yaml +++ b/config/jobs/kubernetes-csi/external-snapshot-metadata/external-snapshot-metadata-config.yaml @@ -35,6 +35,8 @@ presubmits: value: "1.31.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT value: "1.31" + - name: CSI_PROW_E2E_VERSION + value: "release-1.31" - name: CSI_PROW_DEPLOYMENT_SUFFIX value: "" - name: CSI_PROW_DRIVER_VERSION @@ -132,6 +134,8 @@ presubmits: value: "1.32.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT value: "1.32" + - name: CSI_PROW_E2E_VERSION + value: "release-1.32" - name: CSI_PROW_DEPLOYMENT_SUFFIX value: "" - name: CSI_PROW_DRIVER_VERSION @@ -229,6 +233,8 @@ presubmits: value: "1.33.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT value: "1.33" + - name: CSI_PROW_E2E_VERSION + value: "release-1.33" - name: CSI_PROW_DEPLOYMENT_SUFFIX value: "" - name: CSI_PROW_DRIVER_VERSION @@ -326,6 +332,8 @@ presubmits: value: "1.32.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT value: "1.32" + - name: CSI_PROW_E2E_VERSION + value: "release-1.32" - name: CSI_PROW_DEPLOYMENT_SUFFIX value: "" - name: CSI_PROW_DRIVER_VERSION diff --git a/config/jobs/kubernetes-csi/external-snapshotter/external-snapshotter-config.yaml b/config/jobs/kubernetes-csi/external-snapshotter/external-snapshotter-config.yaml index 7ebcaaa62120..9fdd2d48a143 100644 --- a/config/jobs/kubernetes-csi/external-snapshotter/external-snapshotter-config.yaml +++ b/config/jobs/kubernetes-csi/external-snapshotter/external-snapshotter-config.yaml @@ -35,10 +35,10 @@ presubmits: value: "1.31.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT value: "1.31" - - name: CSI_PROW_DEPLOYMENT_SUFFIX - value: "" - name: CSI_PROW_E2E_VERSION value: "release-1.31" + - name: CSI_PROW_DEPLOYMENT_SUFFIX + value: "" - name: CSI_PROW_DRIVER_VERSION value: "v1.17.0" - name: CSI_SNAPSHOTTER_VERSION @@ -233,6 +233,8 @@ presubmits: value: "1.33.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT value: "1.33" + - name: CSI_PROW_E2E_VERSION + value: "release-1.33" - name: CSI_PROW_DEPLOYMENT_SUFFIX value: "" - name: CSI_PROW_DRIVER_VERSION diff --git a/config/jobs/kubernetes-csi/gen-jobs.sh b/config/jobs/kubernetes-csi/gen-jobs.sh index c7fec234fa76..05fe1a2ec9d9 100755 --- a/config/jobs/kubernetes-csi/gen-jobs.sh +++ b/config/jobs/kubernetes-csi/gen-jobs.sh @@ -396,6 +396,8 @@ EOF value: "$kubernetes.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT value: "$deployment" + - name: CSI_PROW_E2E_VERSION + value: "release-$deployment" - name: CSI_PROW_DEPLOYMENT_SUFFIX value: "$deployment_suffix" - name: CSI_PROW_DRIVER_VERSION diff --git a/config/jobs/kubernetes-csi/lib-volume-populator/lib-volume-populator-config.yaml b/config/jobs/kubernetes-csi/lib-volume-populator/lib-volume-populator-config.yaml index f4d5d95b8894..d43ad1af2799 100644 --- a/config/jobs/kubernetes-csi/lib-volume-populator/lib-volume-populator-config.yaml +++ b/config/jobs/kubernetes-csi/lib-volume-populator/lib-volume-populator-config.yaml @@ -33,11 +33,10 @@ presubmits: # by periodic jobs (see https://testgrid.k8s.io/sig-storage-csi-ci#Summary). - name: CSI_PROW_KUBERNETES_VERSION value: "1.31.0" - # Use K8s 1.33+ e2e test version: https://github.com/kubernetes-csi/lib-volume-populator/issues/221 - - name: CSI_PROW_E2E_VERSION - value: "v1.33.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT value: "1.31" + - name: CSI_PROW_E2E_VERSION + value: "release-1.31" - name: CSI_PROW_DEPLOYMENT_SUFFIX value: "" - name: CSI_PROW_DRIVER_VERSION @@ -61,7 +60,7 @@ presubmits: # This cannot be enabled by default because there's always the risk # that something changes in master which breaks the pre-merge check. cluster: eks-prow-build-cluster - always_run: true + always_run: false optional: true decorate: true skip_report: false @@ -133,11 +132,10 @@ presubmits: # by periodic jobs (see https://testgrid.k8s.io/sig-storage-csi-ci#Summary). - name: CSI_PROW_KUBERNETES_VERSION value: "1.32.0" - # Use K8s 1.33+ e2e test version: https://github.com/kubernetes-csi/lib-volume-populator/issues/221 - - name: CSI_PROW_E2E_VERSION - value: "v1.33.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT value: "1.32" + - name: CSI_PROW_E2E_VERSION + value: "release-1.32" - name: CSI_PROW_DEPLOYMENT_SUFFIX value: "" - name: CSI_PROW_DRIVER_VERSION @@ -161,7 +159,7 @@ presubmits: # This cannot be enabled by default because there's always the risk # that something changes in master which breaks the pre-merge check. cluster: eks-prow-build-cluster - always_run: true + always_run: false optional: true decorate: true skip_report: false @@ -235,6 +233,8 @@ presubmits: value: "1.33.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT value: "1.33" + - name: CSI_PROW_E2E_VERSION + value: "release-1.33" - name: CSI_PROW_DEPLOYMENT_SUFFIX value: "" - name: CSI_PROW_DRIVER_VERSION @@ -258,7 +258,7 @@ presubmits: # This cannot be enabled by default because there's always the risk # that something changes in master which breaks the pre-merge check. cluster: eks-prow-build-cluster - always_run: true + always_run: false optional: true decorate: true skip_report: false @@ -301,7 +301,7 @@ presubmits: cpu: 4 - name: pull-kubernetes-csi-lib-volume-populator-alpha-1-32-on-kubernetes-1-32 cluster: eks-prow-build-cluster - always_run: true + always_run: false optional: true decorate: true skip_report: false @@ -332,6 +332,8 @@ presubmits: value: "1.32.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT value: "1.32" + - name: CSI_PROW_E2E_VERSION + value: "release-1.32" - name: CSI_PROW_DEPLOYMENT_SUFFIX value: "" - name: CSI_PROW_DRIVER_VERSION diff --git a/config/jobs/kubernetes-csi/livenessprobe/livenessprobe-config.yaml b/config/jobs/kubernetes-csi/livenessprobe/livenessprobe-config.yaml index 1f8b26c225cc..f1796aeee1e6 100644 --- a/config/jobs/kubernetes-csi/livenessprobe/livenessprobe-config.yaml +++ b/config/jobs/kubernetes-csi/livenessprobe/livenessprobe-config.yaml @@ -35,6 +35,8 @@ presubmits: value: "1.31.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT value: "1.31" + - name: CSI_PROW_E2E_VERSION + value: "release-1.31" - name: CSI_PROW_DEPLOYMENT_SUFFIX value: "" - name: CSI_PROW_DRIVER_VERSION @@ -132,6 +134,8 @@ presubmits: value: "1.32.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT value: "1.32" + - name: CSI_PROW_E2E_VERSION + value: "release-1.32" - name: CSI_PROW_DEPLOYMENT_SUFFIX value: "" - name: CSI_PROW_DRIVER_VERSION @@ -229,6 +233,8 @@ presubmits: value: "1.33.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT value: "1.33" + - name: CSI_PROW_E2E_VERSION + value: "release-1.33" - name: CSI_PROW_DEPLOYMENT_SUFFIX value: "" - name: CSI_PROW_DRIVER_VERSION @@ -326,6 +332,8 @@ presubmits: value: "1.32.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT value: "1.32" + - name: CSI_PROW_E2E_VERSION + value: "release-1.32" - name: CSI_PROW_DEPLOYMENT_SUFFIX value: "" - name: CSI_PROW_DRIVER_VERSION diff --git a/config/jobs/kubernetes-csi/node-driver-registrar/node-driver-registrar-config.yaml b/config/jobs/kubernetes-csi/node-driver-registrar/node-driver-registrar-config.yaml index bc2a49c7fa05..60e807c45912 100644 --- a/config/jobs/kubernetes-csi/node-driver-registrar/node-driver-registrar-config.yaml +++ b/config/jobs/kubernetes-csi/node-driver-registrar/node-driver-registrar-config.yaml @@ -35,6 +35,8 @@ presubmits: value: "1.31.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT value: "1.31" + - name: CSI_PROW_E2E_VERSION + value: "release-1.31" - name: CSI_PROW_DEPLOYMENT_SUFFIX value: "" - name: CSI_PROW_DRIVER_VERSION @@ -132,6 +134,8 @@ presubmits: value: "1.32.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT value: "1.32" + - name: CSI_PROW_E2E_VERSION + value: "release-1.32" - name: CSI_PROW_DEPLOYMENT_SUFFIX value: "" - name: CSI_PROW_DRIVER_VERSION @@ -229,6 +233,8 @@ presubmits: value: "1.33.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT value: "1.33" + - name: CSI_PROW_E2E_VERSION + value: "release-1.33" - name: CSI_PROW_DEPLOYMENT_SUFFIX value: "" - name: CSI_PROW_DRIVER_VERSION @@ -326,6 +332,8 @@ presubmits: value: "1.32.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT value: "1.32" + - name: CSI_PROW_E2E_VERSION + value: "release-1.32" - name: CSI_PROW_DEPLOYMENT_SUFFIX value: "" - name: CSI_PROW_DRIVER_VERSION diff --git a/config/jobs/kubernetes-csi/volume-data-source-validator/volume-data-source-validator-config.yaml b/config/jobs/kubernetes-csi/volume-data-source-validator/volume-data-source-validator-config.yaml index ffcb697c635b..232369073a1c 100644 --- a/config/jobs/kubernetes-csi/volume-data-source-validator/volume-data-source-validator-config.yaml +++ b/config/jobs/kubernetes-csi/volume-data-source-validator/volume-data-source-validator-config.yaml @@ -35,6 +35,8 @@ presubmits: value: "1.31.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT value: "1.31" + - name: CSI_PROW_E2E_VERSION + value: "release-1.31" - name: CSI_PROW_DEPLOYMENT_SUFFIX value: "" - name: CSI_PROW_DRIVER_VERSION @@ -58,7 +60,7 @@ presubmits: # This cannot be enabled by default because there's always the risk # that something changes in master which breaks the pre-merge check. cluster: eks-prow-build-cluster - always_run: true + always_run: false optional: true decorate: true skip_report: false @@ -132,6 +134,8 @@ presubmits: value: "1.32.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT value: "1.32" + - name: CSI_PROW_E2E_VERSION + value: "release-1.32" - name: CSI_PROW_DEPLOYMENT_SUFFIX value: "" - name: CSI_PROW_DRIVER_VERSION @@ -155,7 +159,7 @@ presubmits: # This cannot be enabled by default because there's always the risk # that something changes in master which breaks the pre-merge check. cluster: eks-prow-build-cluster - always_run: true + always_run: false optional: true decorate: true skip_report: false @@ -229,6 +233,8 @@ presubmits: value: "1.33.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT value: "1.33" + - name: CSI_PROW_E2E_VERSION + value: "release-1.33" - name: CSI_PROW_DEPLOYMENT_SUFFIX value: "" - name: CSI_PROW_DRIVER_VERSION @@ -252,7 +258,7 @@ presubmits: # This cannot be enabled by default because there's always the risk # that something changes in master which breaks the pre-merge check. cluster: eks-prow-build-cluster - always_run: true + always_run: false optional: true decorate: true skip_report: false @@ -295,7 +301,7 @@ presubmits: cpu: 4 - name: pull-kubernetes-csi-volume-data-source-validator-alpha-1-32-on-kubernetes-1-32 cluster: eks-prow-build-cluster - always_run: true + always_run: false optional: true decorate: true skip_report: false @@ -326,6 +332,8 @@ presubmits: value: "1.32.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT value: "1.32" + - name: CSI_PROW_E2E_VERSION + value: "release-1.32" - name: CSI_PROW_DEPLOYMENT_SUFFIX value: "" - name: CSI_PROW_DRIVER_VERSION