remove the mention of cgroupv2 from test names as it is assumed now

SergeyKanzhelev · SergeyKanzhelev · commit 447bd2a47f8f · 2025-10-23T19:03:24.000Z
diff --git a/config/jobs/kubernetes/sig-node/README.md b/config/jobs/kubernetes/sig-node/README.md
@@ -17,12 +17,6 @@
    <td>Containerd, CRI-O
    </td>
   </tr>
-  <tr>
-   <td>cgroup
-   </td>
-   <td>cgroupv1, cgroupv2
-   </td>
-  </tr>
   <tr>
    <td>os
    </td>
@@ -41,7 +35,7 @@
 
 ## Naming Convention
 
-(pull|ci)-{$cri}-{$cgroup}-{$os}-{$test-type}-release-{$release-branch}
+(pull|ci)-{$cri}-{$os}-{$test-type}-release-{$release-branch}
 
 **Note:** Specify variable value in the name only if it isn’t set to default in a test tab.
 
@@ -64,13 +58,6 @@
    <td>containerd,  CRI-O
    </td>
   </tr>
-  <tr>
-   <td>cgroup
-   </td>
-   <td>Cgroupv2
-   </td>
-  </tr>
-  <tr>
    <td>os
    </td>
    <td>COS, ubuntu, fedora (create one instance for each OS in a single test job)
@@ -95,7 +82,7 @@
 
 **Test Names as per naming convention**
 
-{cri}-{cgroup}-{os}-{test-type}-release-{release-branch}
+{cri}-{os}-{test-type}-release-{release-branch}
 
 * Node Conformance
     * node-conformance-release-(N-3)
@@ -137,12 +124,6 @@
    <td>containerd
    </td>
   </tr>
-  <tr>
-   <td>cgroup
-   </td>
-   <td>cgroupv2
-   </td>
-  </tr>
   <tr>
    <td>os
    </td>
@@ -171,7 +152,7 @@
 
 **Test Names as per naming convention**
 * Unique names to identify the feature.
-* Follow {cri}-{cgroup}-{os}-{test-type|feature-name}-release-{release-branch} for ordering the variables for non-default values in test names i.e. If you’d like to add a test specific to a CRI, say CRIO and cgroupv2 on Fedora OS for main branch (which is default branch for this tab, the test name would be `crio-cgroup2-fedora-feature-name`.
+* Follow {cri}-{os}-{test-type|feature-name}-release-{release-branch} for ordering the variables for non-default values in test names i.e. If you’d like to add a test specific to a CRI, say CRIO and cgroupv2 on Fedora OS for main branch (which is default branch for this tab, the test name would be `crio-fedora-feature-name`.
 
 Examples: node-conformance-alpha-features-enabled, node-conformance-alpha-features-disabled, kubelet-credential-provider, memory-swap, version-skew-1-25-on-1-27, and so on.
 
diff --git a/config/jobs/kubernetes/sig-node/containerd.yaml b/config/jobs/kubernetes/sig-node/containerd.yaml
@@ -574,7 +574,7 @@ periodics:
     testgrid-dashboards: sig-node-containerd
     testgrid-tab-name: image-validation-node-features
     testgrid-alert-email: sig-node-ci+testgrid@kubernetes.io
-- name: ci-cos-cgroupv2-containerd-node-e2e-features
+- name: ci-cos-containerd-main-node-e2e-features
   cluster: k8s-infra-prow-build
   interval: 1h
   labels:
@@ -624,9 +624,9 @@ periodics:
           memory: 6Gi
   annotations:
     testgrid-dashboards: sig-node-containerd
-    testgrid-tab-name: cos-cgroupv2-containerd-node-features
+    testgrid-tab-name: cos-containerd-main-node-features
     testgrid-alert-email: sig-node-ci+testgrid@kubernetes.io
-- name: ci-cos-cgroupv2-containerd-node-e2e
+- name: ci-cos-containerd-main-node-e2e
   cluster: k8s-infra-prow-build
   interval: 12h
   labels:
@@ -676,7 +676,7 @@ periodics:
           memory: 6Gi
   annotations:
     testgrid-dashboards: sig-node-containerd
-    testgrid-tab-name: cos-cgroupv2-containerd-node-e2e
+    testgrid-tab-name: cos-containerd-main-node-e2e
     testgrid-alert-email: sig-node-ci+testgrid@kubernetes.io
 - name: ci-cgroup-systemd-containerd-node-e2e
   cluster: k8s-infra-prow-build
@@ -731,7 +731,7 @@ periodics:
     testgrid-tab-name: cgroup-systemd-containerd-node-e2e
     testgrid-alert-email: sig-node-ci+testgrid@kubernetes.io
 - interval: 12h
-  name: ci-cos-cgroupv2-containerd-e2e-gce
+  name: ci-cos-containerd-e2e-gce
   cluster: k8s-infra-prow-build
   labels:
     preset-service-account: "true"
@@ -786,9 +786,9 @@ periodics:
 
   annotations:
     testgrid-dashboards: sig-node-containerd
-    testgrid-tab-name: cos-cgroupv2-containerd-e2e
+    testgrid-tab-name: cos-containerd-e2e
     testgrid-alert-email: sig-node-ci+testgrid@kubernetes.io
-- name: ci-cos-cgroupv2-containerd-node-e2e-serial
+- name: ci-cos-containerd-node-e2e-serial
   cluster: k8s-infra-prow-build
   interval: 12h
   labels:
@@ -838,7 +838,7 @@ periodics:
           memory: 6Gi
   annotations:
     testgrid-dashboards: sig-node-containerd
-    testgrid-tab-name: cos-cgroupv2-containerd-node-e2e-serial
+    testgrid-tab-name: cos-containerd-node-e2e-serial
     testgrid-alert-email: sig-node-ci+testgrid@kubernetes.io
 - interval: 30m
   name: ci-kubernetes-e2e-gci-gce-containerd
diff --git a/config/jobs/kubernetes/sig-node/crio.yaml b/config/jobs/kubernetes/sig-node/crio.yaml
@@ -1,5 +1,5 @@
 periodics:
-- name: ci-crio-cgroupv2-node-e2e-features
+- name: ci-crio-node-e2e-features
   cluster: k8s-infra-prow-build
   interval: 1h
   labels:
@@ -20,7 +20,7 @@ periodics:
     path_alias: k8s.io/test-infra
   annotations:
     testgrid-dashboards: sig-node-cri-o
-    testgrid-tab-name: ci-crio-cgroupv2-node-e2e-features
+    testgrid-tab-name: ci-crio-node-e2e-features
     testgrid-alert-email: sig-node-ci+testgrid@kubernetes.io
     description: "OWNER: sig-node; runs Features e2e tests with crio master and cgroup v2"
   spec:
@@ -54,7 +54,7 @@ periodics:
           value: core
         - name: IGNITION_INJECT_GCE_SSH_PUBLIC_KEY_FILE
           value: "1"
-- name: ci-crio-cgroupv2-node-e2e-unlabelled
+- name: ci-crio-node-e2e-unlabelled
   cluster: k8s-infra-prow-build
   interval: 12h
   labels:
@@ -75,7 +75,7 @@ periodics:
     path_alias: k8s.io/test-infra
   annotations:
     testgrid-dashboards: sig-node-cri-o
-    testgrid-tab-name: ci-crio-cgroupv2-node-e2e-unlabelled
+    testgrid-tab-name: ci-crio-node-e2e-unlabelled
     testgrid-alert-email: sig-node-ci+testgrid@kubernetes.io
     description: "Contains all uncategorized tests, these are tests which are not marked with a [Node] tag. All node tests should be marked with [Feature] or [NodeConformance] classification. Also skipped are [Flaky], [Benchmark], [Legacy]."
   spec:
@@ -109,7 +109,7 @@ periodics:
         requests:
           cpu: 4
           memory: 6Gi
-- name: ci-crio-cgroupv2-node-e2e-eviction
+- name: ci-crio-node-e2e-eviction
   cluster: k8s-infra-prow-build
   interval: 4h30m
   labels:
@@ -130,7 +130,7 @@ periodics:
     path_alias: k8s.io/test-infra
   annotations:
     testgrid-dashboards: sig-node-cri-o
-    testgrid-tab-name: ci-crio-cgroupv2-node-e2e-eviction
+    testgrid-tab-name: ci-crio-node-e2e-eviction
     testgrid-alert-email: sig-node-ci+testgrid@kubernetes.io
     description: "OWNER: sig-node; runs Eviction e2e tests with crio master and cgroup v2"
   spec:
@@ -165,7 +165,7 @@ periodics:
           value: core
         - name: IGNITION_INJECT_GCE_SSH_PUBLIC_KEY_FILE
           value: "1"
-- name: ci-node-kubelet-crio-cgroupv2-performance-test
+- name: ci-node-kubelet-crio-performance-test
   cluster: k8s-infra-prow-build
   interval: 12h
   labels:
@@ -186,7 +186,7 @@ periodics:
     path_alias: k8s.io/test-infra
   annotations:
     testgrid-dashboards: sig-node-cri-o
-    testgrid-tab-name: node-kubelet-crio-cgroupv2-performance-test
+    testgrid-tab-name: node-kubelet-crio-performance-test
     testgrid-alert-email: sig-node-ci+testgrid@kubernetes.io
     description: "OWNER: sig-node; runs Eviction e2e tests with crio master and cgroup v2"
   spec:
@@ -221,7 +221,7 @@ periodics:
         requests:
           cpu: 4
           memory: 6Gi
-- name: ci-crio-cgroupv2-node-e2e-conformance
+- name: ci-crio-node-e2e-conformance
   cluster: k8s-infra-prow-build
   interval: 1h
   labels:
@@ -242,7 +242,7 @@ periodics:
     path_alias: k8s.io/test-infra
   annotations:
     testgrid-dashboards: sig-release-master-blocking, sig-node-cri-o, sig-node-release-blocking
-    testgrid-tab-name: ci-crio-cgroupv2-node-e2e-conformance
+    testgrid-tab-name: ci-crio-node-e2e-conformance
     testgrid-alert-email: sig-node-ci+testgrid@kubernetes.io, release-team@kubernetes.io
     description: "OWNER: sig-node; runs NodeConformance e2e tests with crio master and cgroup v2"
   spec:
@@ -277,7 +277,7 @@ periodics:
         requests:
           cpu: 4
           memory: 6Gi
-- name: ci-crio-cgroupv2-node-e2e-resource-managers
+- name: ci-crio-node-e2e-resource-managers
   cluster: k8s-infra-prow-build
   interval: 4h
   labels:
@@ -298,7 +298,7 @@ periodics:
     path_alias: k8s.io/test-infra
   annotations:
     testgrid-dashboards: sig-node-cri-o
-    testgrid-tab-name: ci-crio-cgroupv2-node-e2e-resource-managers
+    testgrid-tab-name: ci-crio-node-e2e-resource-managers
     testgrid-alert-email: sig-node-ci+testgrid@kubernetes.io
     description: "Executes CPU, Memory and Topology manager e2e tests with cgroup v2"
   spec:
@@ -333,7 +333,7 @@ periodics:
           value: core
         - name: IGNITION_INJECT_GCE_SSH_PUBLIC_KEY_FILE
           value: "1"
-- name: ci-crio-cgroupv2-node-e2e-hugepages
+- name: ci-crio-node-e2e-hugepages
   cluster: k8s-infra-prow-build
   interval: 4h
   labels:
@@ -356,7 +356,7 @@ periodics:
     path_alias: k8s.io/test-infra
   annotations:
     testgrid-dashboards: sig-node-cri-o
-    testgrid-tab-name: ci-crio-cgroupv2-node-e2e-hugepages
+    testgrid-tab-name: ci-crio-node-e2e-hugepages
     testgrid-alert-email: sig-node-ci+testgrid@kubernetes.io
     description: "Executes hugepages e2e tests"
   spec:
@@ -390,7 +390,7 @@ periodics:
           value: core
         - name: IGNITION_INJECT_GCE_SSH_PUBLIC_KEY_FILE
           value: "1"
-- name: ci-crio-cgroupv2-userns-e2e-serial
+- name: ci-crio-userns-e2e-serial
   cluster: k8s-infra-prow-build
   interval: 24h
   decorate: true
@@ -414,7 +414,7 @@ periodics:
     preset-pull-kubernetes-e2e-gce: "true"
   annotations:
     testgrid-dashboards: sig-node-cri-o
-    testgrid-tab-name: ci-crio-cgroupv2-userns-e2e-serial
+    testgrid-tab-name: ci-crio-userns-e2e-serial
     testgrid-alert-email: sig-node-ci+testgrid@kubernetes.io
     description: "Executes userns E2E tests with ProcMountType and UserNamespacesSupport feature gates"
   spec:
diff --git a/config/jobs/kubernetes/sig-node/ec2-containerd.yaml b/config/jobs/kubernetes/sig-node/ec2-containerd.yaml
@@ -13,11 +13,11 @@ presets:
       - name: DELETE_INSTANCES
         value: "true"
 periodics:
-  - name: ci-cgroupv2-containerd-node-e2e-ec2
+  - name: ci-containerd-node-e2e-ec2
     interval: 6h
     annotations:
       testgrid-dashboards: sig-node-containerd,amazon-ec2-node
-      testgrid-tab-name: ci-cgroupv2-containerd-node-e2e-ec2
+      testgrid-tab-name: ci-containerd-node-e2e-ec2
       testgrid-alert-email: sig-node-ci+testgrid@kubernetes.io
     labels:
       preset-e2e-containerd-ec2: "true"
@@ -111,11 +111,11 @@ periodics:
             requests:
               cpu: 8
               memory: 10Gi
-  - name: ci-cgroupv2-containerd-node-arm64-e2e-serial-ec2
+  - name: ci-containerd-node-arm64-e2e-serial-ec2
     interval: 6h
     annotations:
       testgrid-dashboards: sig-node-containerd,amazon-ec2-node
-      testgrid-tab-name: ci-cgroupv2-containerd-node-arm64-e2e-serial-ec2
+      testgrid-tab-name: ci-containerd-node-arm64-e2e-serial-ec2
       testgrid-alert-email: sig-node-ci+testgrid@kubernetes.io
     labels:
       preset-e2e-containerd-ec2: "true"
@@ -166,11 +166,11 @@ periodics:
             requests:
               cpu: 8
               memory: 10Gi
-  - name: ci-cgroupv2-containerd-node-e2e-serial-ec2
+  - name: ci-containerd-node-e2e-serial-ec2
     interval: 6h
     annotations:
       testgrid-dashboards: sig-node-containerd,amazon-ec2-node
-      testgrid-tab-name: ci-cgroupv2-containerd-node-e2e-serial-ec2
+      testgrid-tab-name: ci-containerd-node-e2e-serial-ec2
       testgrid-alert-email: sig-node-ci+testgrid@kubernetes.io
     labels:
       preset-e2e-containerd-ec2: "true"
diff --git a/config/jobs/kubernetes/sig-node/node-kubelet.yaml b/config/jobs/kubernetes/sig-node/node-kubelet.yaml
@@ -152,7 +152,7 @@ periodics:
     description: "Uses kubetest to run serial node-e2e tests (+Serial|+Flaky, (Benchmark|Node*Feature)"
 
 
-- name: ci-kubernetes-node-kubelet-cgroupv2-serial-cri-o
+- name: ci-kubernetes-node-kubelet-serial-cri-o
   cluster: k8s-infra-prow-build
   interval: 12h
   labels:
@@ -201,7 +201,7 @@ periodics:
           memory: 12Gi
   annotations:
     testgrid-dashboards: sig-node-cri-o
-    testgrid-tab-name: node-kubelet-cgroupv2-serial-crio
+    testgrid-tab-name: node-kubelet-serial-crio
     testgrid-alert-email: sig-node-ci+testgrid@kubernetes.io
     description: "Uses kubetest to run serial node-e2e tests with cgroupv2 (+Serial, -Flaky|Benchmark|Node*Feature)"
 
diff --git a/config/jobs/kubernetes/sig-node/sig-node-presubmit.yaml b/config/jobs/kubernetes/sig-node/sig-node-presubmit.yaml
diff --git a/config/testgrids/kubernetes/sig-node/config.yaml b/config/testgrids/kubernetes/sig-node/config.yaml
