Merge pull request #34513 from carlory/update-ci-pull-kubernetes-e2e-storage-kind-alpha-beta-features

remove ci/pull-kubernetes-e2e-storage-kind-alpha-beta-features

Author: k8s-ci-robot

config/jobs/kubernetes/sig-storage/sig-storage-kind.yaml

@@ -54,54 +54,6 @@ presubmits:
             cpu: "2"
             memory: "6Gi"
 
-  # This jobs runs e2e.test with a focus on tests for all alpha/beta storage features on a kind cluster
-  - name: pull-kubernetes-e2e-storage-kind-alpha-beta-features
-    always_run: false
-    optional: true
-    decorate: true
-    path_alias: k8s.io/kubernetes
-    cluster: eks-prow-build-cluster
-    skip_branches:
-    - release-\d+\.\d+
-    annotations:
-      testgrid-dashboards: presubmits-kubernetes-nonblocking
-      testgrid-tab-name: pull-kubernetes-e2e-storage-kind-alpha-beta-features
-      testgrid-alert-email: [email protected]
-      description: Run storage tests for alpha/beta features in a KIND cluster.
-    labels:
-      preset-service-account: "true"
-      preset-dind-enabled: "true"
-      preset-kind-volume-mounts: "true"
-    spec:
-      containers:
-      - image: gcr.io/k8s-staging-test-infra/krte:v20250422-9d0e6fd518-master
-        command:
-        - wrapper.sh
-        - bash
-        - -c
-        - curl -sSL https://kind.sigs.k8s.io/dl/latest/linux-amd64.tgz | tar xvfz - -C "${PATH%%:*}/" && e2e-k8s.sh
-        env:
-        - name: FEATURE_GATES
-          value: '{"VolumeAttributesClass":true, "CSIVolumeHealth": true}'
-        - name: RUNTIME_CONFIG
-          value: '{"api/ga":"true", "storage.k8s.io/v1alpha1":"true", "storage.k8s.io/v1beta1":"true"}'
-        - name: FOCUS
-          value: \[Feature:VolumeAttributesClass\]|\[Feature:CSIVolumeHealth\]
-        - name: SKIP
-          value: \[Slow\]|\[Disruptive\]|\[Flaky\]
-        - name: PARALLEL
-          value: "true"
-        # we need privileged mode in order to do docker in docker
-        securityContext:
-          privileged: true
-        resources:
-          requests:
-            cpu: "2"
-            memory: "6Gi"
-          limits:
-            cpu: "2"
-            memory: "6Gi"
-
   - name: pull-kubernetes-e2e-storage-kind-volume-group-snapshots
     always_run: false
     optional: true
@@ -192,55 +144,6 @@ periodics:
             cpu: "2"
             memory: "6Gi"
 
-  # This jobs runs e2e.test with a focus on tests for all alpha/beta storage features on a kind cluster
-  - name: ci-kubernetes-e2e-storage-kind-alpha-beta-features
-    interval: 12h
-    annotations:
-      testgrid-dashboards: sig-storage-kubernetes
-      testgrid-tab-name: kind-storage-alpha-beta-features
-      testgrid-alert-email: [email protected]
-      description: Run storage tests for alpha features in a KIND cluster.
-    decorate: true
-    extra_refs:
-    - org: kubernetes
-      repo: kubernetes
-      base_ref: master
-      path_alias: k8s.io/kubernetes
-    cluster: eks-prow-build-cluster
-    labels:
-      preset-service-account: "true"
-      preset-dind-enabled: "true"
-      preset-kind-volume-mounts: "true"
-    spec:
-      containers:
-      - image: gcr.io/k8s-staging-test-infra/krte:v20250422-9d0e6fd518-master
-        command:
-        - wrapper.sh
-        - bash
-        - -c
-        - curl -sSL https://kind.sigs.k8s.io/dl/latest/linux-amd64.tgz | tar xvfz - -C "${PATH%%:*}/" && e2e-k8s.sh
-        env:
-        - name: FEATURE_GATES
-          value: '{"VolumeAttributesClass":true, "CSIVolumeHealth": true}'
-        - name: RUNTIME_CONFIG
-          value: '{"api/ga":"true", "storage.k8s.io/v1alpha1":"true", "storage.k8s.io/v1beta1":"true"}'
-        - name: FOCUS
-          value: \[Feature:VolumeAttributesClass\]|\[Feature:CSIVolumeHealth\]
-        - name: SKIP
-          value: \[Slow\]|\[Disruptive\]|\[Flaky\]
-        - name: PARALLEL
-          value: "true"
-        # we need privileged mode in order to do docker in docker
-        securityContext:
-          privileged: true
-        resources:
-          requests:
-            cpu: "2"
-            memory: "6Gi"
-          limits:
-            cpu: "2"
-            memory: "6Gi"
-
   - name: ci-kubernetes-e2e-storage-kind-volume-group-snapshots
     interval: 12h
     annotations:

config/testgrids/kubernetes/sig-storage/config.yaml

@@ -71,6 +71,12 @@ dashboards:
       description: storage snapshot e2e tests for master branch
       alert_options:
         alert_mail_to_addresses: [email protected]
+    - name: kind-master-alpha-beta
+      test_group_name: ci-kubernetes-e2e-kind-alpha-beta-features
+      base_options: include-filter-by-regex=Volume%7Cstorage
+      description: Runs storage e2e tests with no special requirements other than alpha or beta feature gates in a KinD cluster where alpha and beta feature gates and APIs are enabled.
+      alert_options:
+        alert_mail_to_addresses: [email protected]
 
 - name: sig-storage-local-static-provisioner
   dashboard_tab: