test/e2e: delete CgV1 skips, delete tests skipped on Cgv2

lsm5 · lsm5 · commit 050882a1c885 · 2025-11-05T10:48:07.000-05:00
Signed-off-by: Lokesh Mandvekar &lt;lsm5@redhat.com&gt;
diff --git a/test/e2e/cleanup_test.go b/test/e2e/cleanup_test.go
@@ -98,7 +98,6 @@ var _ = Describe("Podman container cleanup", func() {
 	})
 
 	It("podman cleanup paused container", func() {
-		SkipIfRootlessCgroupsV1("Pause is not supported in cgroups v1")
 		session := podmanTest.RunTopContainer("paused")
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(ExitCleanly())
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go
@@ -38,7 +38,6 @@ import (
 	. "github.com/onsi/gomega"
 	. "github.com/onsi/gomega/gexec"
 	"github.com/sirupsen/logrus"
-	"go.podman.io/common/pkg/cgroups"
 	"go.podman.io/common/pkg/libartifact"
 	"go.podman.io/storage/pkg/ioutils"
 	"go.podman.io/storage/pkg/lockfile"
@@ -53,7 +52,6 @@ var (
 	CGROUP_MANAGER     = "systemd"
 	RESTORE_IMAGES     = []string{ALPINE, BB, NGINX_IMAGE}
 	defaultWaitTimeout = 90
-	CGROUPSV2, _       = cgroups.IsCgroup2UnifiedMode()
 )
 
 // PodmanTestIntegration struct for command line options
@@ -1080,13 +1078,6 @@ func SkipIfRunc(p *PodmanTestIntegration, reason string) {
 	}
 }
 
-func SkipIfRootlessCgroupsV1(reason string) {
-	checkReason(reason)
-	if isRootless() && !CGROUPSV2 {
-		Skip("[rootless]: " + reason)
-	}
-}
-
 func SkipIfRootless(reason string) {
 	checkReason(reason)
 	if isRootless() {
@@ -1179,24 +1170,6 @@ func isRootless() bool {
 	return os.Geteuid() != 0
 }
 
-func isCgroupsV1() bool {
-	return !CGROUPSV2
-}
-
-func SkipIfCgroupV1(reason string) {
-	checkReason(reason)
-	if isCgroupsV1() {
-		Skip(reason)
-	}
-}
-
-func SkipIfCgroupV2(reason string) {
-	checkReason(reason)
-	if CGROUPSV2 {
-		Skip(reason)
-	}
-}
-
 func isContainerized() bool {
 	// This is set to "podman" by podman automatically
 	return os.Getenv("container") != ""
diff --git a/test/e2e/container_clone_test.go b/test/e2e/container_clone_test.go
@@ -15,7 +15,6 @@ var _ = Describe("Podman container clone", func() {
 	})
 
 	It("podman container clone basic test", func() {
-		SkipIfRootlessCgroupsV1("starting a container with the memory limits not supported")
 		create := podmanTest.Podman([]string{"create", ALPINE})
 		create.WaitWithDefaultTimeout()
 		Expect(create).To(ExitCleanly())
@@ -68,7 +67,6 @@ var _ = Describe("Podman container clone", func() {
 	})
 
 	It("podman container clone resource limits override", func() {
-		SkipIfRootlessCgroupsV1("Not supported for rootless + CgroupsV1")
 		create := podmanTest.Podman([]string{"create", "--cpus=5", ALPINE})
 		create.WaitWithDefaultTimeout()
 		Expect(create).To(ExitCleanly())
@@ -144,7 +142,6 @@ var _ = Describe("Podman container clone", func() {
 	})
 
 	It("podman container clone in a pod", func() {
-		SkipIfRootlessCgroupsV1("starting a container with the memory limits not supported")
 		run := podmanTest.Podman([]string{"run", "-dt", "--pod", "new:1234", ALPINE, "sleep", "20"})
 		run.WaitWithDefaultTimeout()
 		Expect(run).To(ExitCleanly())
diff --git a/test/e2e/containers_conf_test.go b/test/e2e/containers_conf_test.go
@@ -32,7 +32,6 @@ var _ = Describe("Verify podman containers.conf usage", func() {
 	})
 
 	It("limits test", func() {
-		SkipIfRootlessCgroupsV1("Setting limits not supported on cgroupv1 for rootless users")
 		// containers.conf is set to "nofile=500:500"
 		session := podmanTest.Podman([]string{"run", "--rm", fedoraMinimal, "ulimit", "-n"})
 		session.WaitWithDefaultTimeout()
@@ -59,7 +58,6 @@ var _ = Describe("Verify podman containers.conf usage", func() {
 	})
 
 	It("oom-score-adj", func() {
-		SkipIfRootlessCgroupsV1("Setting limits not supported on cgroupv1 for rootless users")
 		// containers.conf is set to "oom_score_adj=999"
 		session := podmanTest.Podman([]string{"run", "--rm", ALPINE, "cat", "/proc/self/oom_score_adj"})
 		session.WaitWithDefaultTimeout()
@@ -91,9 +89,6 @@ var _ = Describe("Verify podman containers.conf usage", func() {
 	})
 
 	It("cgroup_conf in containers.conf", func() {
-		if isCgroupsV1() {
-			Skip("Setting cgroup_confs not supported on cgroupv1")
-		}
 		// FIXME: Needs crun-1.8.2-2 to allow this with --cgroup-manager=cgroupfs, once this is available remove the skip below.
 		SkipIfRootless("--cgroup-manager=cgoupfs and --cgroup-conf not supported in rootless mode with crun")
 		conffile := filepath.Join(podmanTest.TempDir, "container.conf")
@@ -152,7 +147,6 @@ var _ = Describe("Verify podman containers.conf usage", func() {
 	})
 
 	It("add capabilities", func() {
-		SkipIfRootlessCgroupsV1("Not supported for rootless + CGroupsV1")
 		cap := podmanTest.Podman([]string{"run", ALPINE, "grep", "CapEff", "/proc/self/status"})
 		cap.WaitWithDefaultTimeout()
 		Expect(cap).Should(ExitCleanly())
@@ -198,7 +192,6 @@ var _ = Describe("Verify podman containers.conf usage", func() {
 	})
 
 	verifyNSHandling := func(nspath, option string) {
-		SkipIfRootlessCgroupsV1("Not supported for rootless + CgroupsV1")
 		os.Setenv("CONTAINERS_CONF", "config/containers-ns.conf")
 		if IsRemote() {
 			podmanTest.RestartRemoteService()
diff --git a/test/e2e/cp_test.go b/test/e2e/cp_test.go
@@ -73,7 +73,6 @@ var _ = Describe("Podman cp", func() {
 
 	// Copy a file to the container, then back to the host in --pid=host
 	It("podman cp --pid=host file", func() {
-		SkipIfRootlessCgroupsV1("Not supported for rootless + CgroupsV1")
 		srcFile, err := os.CreateTemp("", "")
 		Expect(err).ToNot(HaveOccurred())
 		defer srcFile.Close()
diff --git a/test/e2e/create_test.go b/test/e2e/create_test.go
@@ -427,7 +427,6 @@ var _ = Describe("Podman create", func() {
 	})
 
 	It("podman create with -m 1000000 sets swap to 2000000", func() {
-		SkipIfRootlessCgroupsV1("Not supported for rootless + CgroupsV1")
 		numMem := 1000000
 		ctrName := "testCtr"
 		session := podmanTest.Podman([]string{"create", "-t", "-m", fmt.Sprintf("%db", numMem), "--name", ctrName, ALPINE, "/bin/sh"})
@@ -442,7 +441,6 @@ var _ = Describe("Podman create", func() {
 	})
 
 	It("podman create --cpus 5 sets nanocpus", func() {
-		SkipIfRootlessCgroupsV1("Not supported for rootless + CgroupsV1")
 		numCpus := 5
 		nanoCPUs := numCpus * 1000000000
 		ctrName := "testCtr"
diff --git a/test/e2e/generate_kube_test.go b/test/e2e/generate_kube_test.go
@@ -608,7 +608,6 @@ var _ = Describe("Podman kube generate", func() {
 	})
 
 	It("on pod with memory limit", func() {
-		SkipIfRootlessCgroupsV1("Not supported for rootless + CgroupsV1")
 		podName := "testMemoryLimit"
 		podSession := podmanTest.Podman([]string{"pod", "create", "--name", podName})
 		podSession.WaitWithDefaultTimeout()
@@ -634,7 +633,6 @@ var _ = Describe("Podman kube generate", func() {
 	})
 
 	It("on pod with cpu limit", func() {
-		SkipIfRootlessCgroupsV1("Not supported for rootless + CgroupsV1")
 		podName := "testCpuLimit"
 		podSession := podmanTest.Podman([]string{"pod", "create", "--name", podName})
 		podSession.WaitWithDefaultTimeout()
diff --git a/test/e2e/generate_spec_test.go b/test/e2e/generate_spec_test.go
@@ -8,7 +8,6 @@ import (
 	. "github.com/containers/podman/v6/test/utils"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	. "github.com/onsi/gomega/gexec"
 )
 
 var _ = Describe("Podman generate spec", func() {
@@ -24,7 +23,6 @@ var _ = Describe("Podman generate spec", func() {
 	})
 
 	It("podman generate spec basic usage", func() {
-		SkipIfRootlessCgroupsV1("Not supported for rootless + CgroupsV1")
 		session := podmanTest.Podman([]string{"create", "--cpus", "5", "--name", "specgen", ALPINE})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(ExitCleanly())
@@ -35,7 +33,6 @@ var _ = Describe("Podman generate spec", func() {
 	})
 
 	It("podman generate spec file", func() {
-		SkipIfRootlessCgroupsV1("Not supported for rootless + CgroupsV1")
 		session := podmanTest.Podman([]string{"create", "--cpus", "5", "--name", "specgen", ALPINE})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(ExitCleanly())
@@ -60,12 +57,6 @@ var _ = Describe("Podman generate spec", func() {
 
 		session = podmanTest.Podman([]string{"generate", "spec", "--compact", "podspecgen"})
 		session.WaitWithDefaultTimeout()
-
-		if isRootless() && !CGROUPSV2 {
-			Expect(session).Should(Exit(0))
-			Expect(session.ErrorToString()).Should(ContainSubstring("Resource limits are not supported and ignored on cgroups V1 rootless"))
-		} else {
-			Expect(session).Should(ExitCleanly())
-		}
+		Expect(session).Should(ExitCleanly())
 	})
 })
diff --git a/test/e2e/info_test.go b/test/e2e/info_test.go
@@ -133,7 +133,6 @@ var _ = Describe("Podman Info", func() {
 
 	It("Podman info must contain cgroupControllers with RelevantControllers", func() {
 		SkipIfRootless("Hard to tell which controllers are going to be enabled for rootless")
-		SkipIfRootlessCgroupsV1("Disable cgroups not supported on cgroupv1 for rootless users")
 		session := podmanTest.Podman([]string{"info", "--format", "{{.Host.CgroupControllers}}"})
 		session.WaitWithDefaultTimeout()
 		Expect(session).To(ExitCleanly())
diff --git a/test/e2e/kill_test.go b/test/e2e/kill_test.go
@@ -108,7 +108,6 @@ var _ = Describe("Podman kill", func() {
 	})
 
 	It("podman kill paused container", func() {
-		SkipIfRootlessCgroupsV1("pause is not supported for cgroupv1 rootless")
 		ctrName := "testctr"
 		session := podmanTest.RunTopContainer(ctrName)
 		session.WaitWithDefaultTimeout()
diff --git a/test/e2e/network_connect_disconnect_test.go b/test/e2e/network_connect_disconnect_test.go
@@ -50,7 +50,6 @@ var _ = Describe("Podman network connect and disconnect", func() {
 	})
 
 	It("podman network disconnect", func() {
-		SkipIfRootlessCgroupsV1("stats not supported under rootless CgroupsV1")
 		netName := "aliasTest" + stringid.GenerateRandomID()
 		session := podmanTest.Podman([]string{"network", "create", netName})
 		session.WaitWithDefaultTimeout()
@@ -171,7 +170,6 @@ var _ = Describe("Podman network connect and disconnect", func() {
 	})
 
 	It("podman network connect", func() {
-		SkipIfRootlessCgroupsV1("stats not supported under rootless CgroupsV1")
 		netName := "aliasTest" + stringid.GenerateRandomID()
 		session := podmanTest.Podman([]string{"network", "create", netName})
 		session.WaitWithDefaultTimeout()
diff --git a/test/e2e/pause_test.go b/test/e2e/pause_test.go
@@ -18,19 +18,15 @@ var _ = Describe("Podman pause", func() {
 	createdState := "created"
 
 	BeforeEach(func() {
-		SkipIfRootlessCgroupsV1("Pause is not supported in cgroups v1")
-
-		if CGROUPSV2 {
-			b, err := os.ReadFile("/proc/self/cgroup")
-			if err != nil {
-				Skip("cannot read self cgroup")
-			}
-
-			path := filepath.Join("/sys/fs/cgroup", strings.TrimSuffix(strings.Replace(string(b), "0::", "", 1), "\n"), "cgroup.freeze")
-			_, err = os.Stat(path)
-			if err != nil {
-				Skip("freezer controller not available on the current kernel")
-			}
+		b, err := os.ReadFile("/proc/self/cgroup")
+		if err != nil {
+			Skip("cannot read self cgroup")
+		}
+
+		path := filepath.Join("/sys/fs/cgroup", strings.TrimSuffix(strings.Replace(string(b), "0::", "", 1), "\n"), "cgroup.freeze")
+		_, err = os.Stat(path)
+		if err != nil {
+			Skip("freezer controller not available on the current kernel")
 		}
 
 	})
diff --git a/test/e2e/pod_create_test.go b/test/e2e/pod_create_test.go
@@ -1196,8 +1196,6 @@ ENTRYPOINT ["sleep","99999"]
 	})
 
 	It("podman pod create --share-parent test", func() {
-		SkipIfRootlessCgroupsV1("rootless cannot use cgroups with cgroupsv1")
-		SkipIfCgroupV1("CgroupMode shows 'host' on CGv1, not CID (issue 15013, wontfix")
 		podCreate := podmanTest.Podman([]string{"pod", "create", "--share-parent=false"})
 		podCreate.WaitWithDefaultTimeout()
 		Expect(podCreate).Should(ExitCleanly())
diff --git a/test/e2e/pod_infra_container_test.go b/test/e2e/pod_infra_container_test.go
@@ -227,7 +227,6 @@ var _ = Describe("Podman pod create", func() {
 	})
 
 	It("podman pod container can override pod pid NS", func() {
-		SkipIfRootlessCgroupsV1("Not supported for rootless + CgroupsV1")
 		session := podmanTest.Podman([]string{"pod", "create", "--share", "pid"})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(ExitCleanly())
diff --git a/test/e2e/pod_kill_test.go b/test/e2e/pod_kill_test.go
@@ -108,7 +108,6 @@ var _ = Describe("Podman pod kill", func() {
 	})
 
 	It("podman pod kill all", func() {
-		SkipIfRootlessCgroupsV1("Not supported for rootless + CgroupsV1")
 		_, ec, podid := podmanTest.CreatePod(nil)
 		Expect(ec).To(Equal(0))
 
diff --git a/test/e2e/pod_pause_test.go b/test/e2e/pod_pause_test.go
@@ -11,10 +11,6 @@ import (
 var _ = Describe("Podman pod pause", func() {
 	pausedState := "Paused"
 
-	BeforeEach(func() {
-		SkipIfRootlessCgroupsV1("Pause is not supported in cgroups v1")
-	})
-
 	It("podman pod pause bogus pod", func() {
 		session := podmanTest.Podman([]string{"pod", "pause", "foobar"})
 		session.WaitWithDefaultTimeout()
diff --git a/test/e2e/pod_ps_test.go b/test/e2e/pod_ps_test.go
@@ -157,7 +157,6 @@ var _ = Describe("Podman ps", func() {
 	})
 
 	It("podman pod ps --ctr-names", func() {
-		SkipIfRootlessCgroupsV1("Not supported for rootless + CgroupsV1")
 		_, ec, podid := podmanTest.CreatePod(nil)
 		Expect(ec).To(Equal(0))
 
diff --git a/test/e2e/pod_stats_test.go b/test/e2e/pod_stats_test.go
@@ -10,13 +10,6 @@ import (
 
 var _ = Describe("Podman pod stats", func() {
 
-	BeforeEach(func() {
-		SkipIfRootlessCgroupsV1("Tests fail with both CGv1 + required --cgroup-manager=cgroupfs")
-		if isContainerized() {
-			SkipIfCgroupV1("All tests fail Error: unable to load cgroup at ...: cgroup deleted")
-		}
-	})
-
 	It("podman pod stats should run with no pods", func() {
 		session := podmanTest.Podman([]string{"pod", "stats", "--no-stream"})
 		session.WaitWithDefaultTimeout()
diff --git a/test/e2e/run_cgroup_parent_test.go b/test/e2e/run_cgroup_parent_test.go
@@ -17,10 +17,6 @@ const cgroupRoot = "/sys/fs/cgroup"
 
 var _ = Describe("Podman run with --cgroup-parent", func() {
 
-	BeforeEach(func() {
-		SkipIfRootlessCgroupsV1("cgroup parent is not supported in cgroups v1")
-	})
-
 	Specify("valid --cgroup-parent using cgroupfs", func() {
 		if !Containerized() {
 			Skip("Must be containerized to run this test.")
@@ -48,7 +44,6 @@ var _ = Describe("Podman run with --cgroup-parent", func() {
 	})
 
 	Specify("always honor --cgroup-parent", func() {
-		SkipIfCgroupV1("test not supported in cgroups v1")
 		if Containerized() || podmanTest.CgroupManager == "cgroupfs" {
 			Skip("Requires Systemd cgroup manager support")
 		}
diff --git a/test/e2e/run_cpu_test.go b/test/e2e/run_cpu_test.go
diff --git a/test/e2e/run_memory_test.go b/test/e2e/run_memory_test.go
diff --git a/test/e2e/run_ns_test.go b/test/e2e/run_ns_test.go
diff --git a/test/e2e/run_selinux_test.go b/test/e2e/run_selinux_test.go
diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go
diff --git a/test/e2e/stats_test.go b/test/e2e/stats_test.go
diff --git a/test/e2e/systemd_test.go b/test/e2e/systemd_test.go
diff --git a/test/e2e/toolbox_test.go b/test/e2e/toolbox_test.go
diff --git a/test/e2e/update_test.go b/test/e2e/update_test.go
