test: remove cgroupsv1 tests and skips

Signed-off-by: Lokesh Mandvekar <[email protected]>

Author: lsm5

test/apiv2/25-containersMore.at

@@ -28,15 +28,6 @@ if root || have_cgroupsv2; then
       .Name=foo
 
     t POST libpod/containers/foo/unpause 204
-else
-    # cgroupsv1 rootless : pause and unpause are not supported in cgroups v1 rootless
-    t POST libpod/containers/foo/pause 500 \
-      .cause="this container does not have a cgroup" \
-      .message~".*pause containers on rootless containers with cgroup V1"
-
-    t POST libpod/containers/foo/unpause 500 \
-      .cause="container state improper" \
-      .message~".*is not paused, can't unpause: container state improper"
 fi
 
 t GET libpod/containers/foo/json 200 \

test/apiv2/40-pods.at

@@ -47,14 +47,7 @@ t POST libpod/pods/fakename/start 404 \
   .cause="no such pod" \
   .message="no pod with name or ID fakename found: no such pod"
 
-if root || have_cgroupsv2; then
-    t POST libpod/pods/foo/pause 200
-else
-    # Rootless cgroupsv1 : unsupported
-    t POST "libpod/pods/foo/pause (rootless cgroups v1)" 500 \
-      .cause="this container does not have a cgroup" \
-      .message~".*pause pods containing rootless containers with cgroup V1"
-fi
+t POST libpod/pods/foo/pause 200
 t POST  libpod/pods/foo/unpause 200
 t POST "libpod/pods/foo/unpause (2nd unpause in a row)" 200
 t POST "libpod/pods/fakename/unpause" 404\
@@ -108,28 +101,21 @@ t POST libpod/pods/bar/stop?t=1 200 \
 
 t POST libpod/pods/bar/start 200
 
-if root || have_cgroupsv2; then
-    t GET libpod/pods/stats?all=true 200
-    is $(jq '. | length' <<<"$output") 3 "stats?all=true: number of records found"
+t GET libpod/pods/stats?all=true 200
+is $(jq '. | length' <<<"$output") 3 "stats?all=true: number of records found"
 
-    t GET libpod/pods/stats?namesOrIDs=foo 200
-    is $(jq '. | length' <<<"$output") 1 "stats?namesOrIDs=foo: number of records found"
+t GET libpod/pods/stats?namesOrIDs=foo 200
+is $(jq '. | length' <<<"$output") 1 "stats?namesOrIDs=foo: number of records found"
 
-    t GET libpod/pods/stats?namesOrIDs=fakename 404 \
-      .cause="no such pod" \
+t GET libpod/pods/stats?namesOrIDs=fakename 404 \
+    .cause="no such pod" \
       .message="unable to get list of pods: no pod with name or ID fakename found: no such pod"
 
-    t GET "libpod/pods/stats?all=true&namesOrIDs=foo" 500 \
-      .cause="--all, --latest and arguments cannot be used together" \
-      .message="--all, --latest and arguments cannot be used together"
+t GET "libpod/pods/stats?all=true&namesOrIDs=foo" 500 \
+    .cause="--all, --latest and arguments cannot be used together" \
+    .message="--all, --latest and arguments cannot be used together"
 
-    t DELETE  libpod/pods/bar?force=true 200
-else
-    # Rootless cgroupsv1 : libpod/pods/stats is unsupported
-    t GET libpod/pods/stats?all=true 500 \
-      .cause="pod stats is not supported in rootless mode without cgroups v2" \
-      .message~"pod stats is not supported in rootless mode without cgroups v2"
-fi
+t DELETE  libpod/pods/bar?force=true 200
 
 # test the fake name
 t GET libpod/pods/fakename/top 404 \
@@ -161,10 +147,7 @@ t DELETE  libpod/pods/foo 200
 t DELETE "libpod/pods/foo (pod has already been deleted)" 404
 
 # Expect this to time out
-if root || have_cgroupsv2; then
-    # Rootless cgroupsv1 : libpod/pods/stats is unsupported
-    APIV2_TEST_EXPECT_TIMEOUT=5 t GET "libpod/pods/stats?stream=true&delay=1" 999
-fi
+APIV2_TEST_EXPECT_TIMEOUT=5 t GET "libpod/pods/stats?stream=true&delay=1" 999
 
 podman pod create --name=specgen
 

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())

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
@@ -784,7 +782,7 @@ func (p *PodmanTestIntegration) RunTopContainer(name string) *PodmanSessionInteg
 // runs top.  If the name passed != "", it will have a name, command args can also be passed in
 func (p *PodmanTestIntegration) RunTopContainerWithArgs(name string, args []string) *PodmanSessionIntegration {
 	// In proxy environment, some tests need to the --http-proxy=false option (#16684)
-	var podmanArgs = []string{"run", "--http-proxy=false"}
+	podmanArgs := []string{"run", "--http-proxy=false"}
 	if name != "" {
 		podmanArgs = append(podmanArgs, "--name", name)
 	}
@@ -803,7 +801,7 @@ func (p *PodmanTestIntegration) RunTopContainerWithArgs(name string, args []stri
 // RunLsContainer runs a simple container in the background that
 // simply runs ls. If the name passed != "", it will have a name
 func (p *PodmanTestIntegration) RunLsContainer(name string) (*PodmanSessionIntegration, int, string) {
-	var podmanArgs = []string{"run"}
+	podmanArgs := []string{"run"}
 	if name != "" {
 		podmanArgs = append(podmanArgs, "--name", name)
 	}
@@ -822,7 +820,7 @@ func (p *PodmanTestIntegration) RunLsContainer(name string) (*PodmanSessionInteg
 
 // RunNginxWithHealthCheck runs the alpine nginx container with an optional name and adds a healthcheck into it
 func (p *PodmanTestIntegration) RunNginxWithHealthCheck(name string) (*PodmanSessionIntegration, string) {
-	var podmanArgs = []string{"run"}
+	podmanArgs := []string{"run"}
 	if name != "" {
 		podmanArgs = append(podmanArgs, "--name", name)
 	}
@@ -835,7 +833,7 @@ func (p *PodmanTestIntegration) RunNginxWithHealthCheck(name string) (*PodmanSes
 
 // RunContainerWithNetworkTest runs the fedoraMinimal curl with the specified network mode.
 func (p *PodmanTestIntegration) RunContainerWithNetworkTest(mode string) *PodmanSessionIntegration {
-	var podmanArgs = []string{"run"}
+	podmanArgs := []string{"run"}
 	if mode != "" {
 		podmanArgs = append(podmanArgs, "--network", mode)
 	}
@@ -845,7 +843,7 @@ func (p *PodmanTestIntegration) RunContainerWithNetworkTest(mode string) *Podman
 }
 
 func (p *PodmanTestIntegration) RunLsContainerInPod(name, pod string) (*PodmanSessionIntegration, int, string) {
-	var podmanArgs = []string{"run", "--pod", pod}
+	podmanArgs := []string{"run", "--pod", pod}
 	if name != "" {
 		podmanArgs = append(podmanArgs, "--name", name)
 	}
@@ -1006,7 +1004,7 @@ func (s *PodmanSessionIntegration) InspectPodArrToJSON() []define.InspectPodData
 // CreatePod creates a pod with no infra container
 // it optionally takes a pod name
 func (p *PodmanTestIntegration) CreatePod(options map[string][]string) (*PodmanSessionIntegration, int, string) {
-	var args = []string{"pod", "create", "--infra=false", "--share", ""}
+	args := []string{"pod", "create", "--infra=false", "--share", ""}
 	for k, values := range options {
 		for _, v := range values {
 			args = append(args, k+"="+v)
@@ -1019,7 +1017,7 @@ func (p *PodmanTestIntegration) CreatePod(options map[string][]string) (*PodmanS
 }
 
 func (p *PodmanTestIntegration) CreateVolume(options map[string][]string) (*PodmanSessionIntegration, int, string) {
-	var args = []string{"volume", "create"}
+	args := []string{"volume", "create"}
 	for k, values := range options {
 		for _, v := range values {
 			args = append(args, k+"="+v)
@@ -1083,13 +1081,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() {
@@ -1182,24 +1173,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") != ""
@@ -1382,8 +1355,10 @@ func (p *PodmanTestIntegration) makeOptions(args []string, options PodmanExecOpt
 
 	podmanOptions = append(podmanOptions, strings.Split(p.StorageOptions, " ")...)
 	if !options.NoCache {
-		cacheOptions := []string{"--storage-opt",
-			fmt.Sprintf("%s.imagestore=%s", p.PodmanTest.ImageCacheFS, p.PodmanTest.ImageCacheDir)}
+		cacheOptions := []string{
+			"--storage-opt",
+			fmt.Sprintf("%s.imagestore=%s", p.PodmanTest.ImageCacheFS, p.PodmanTest.ImageCacheDir),
+		}
 		podmanOptions = append(cacheOptions, podmanOptions...)
 	}
 	podmanOptions = append(podmanOptions, args...)

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())

test/e2e/containers_conf_test.go

@@ -20,19 +20,16 @@ import (
 )
 
 var _ = Describe("Verify podman containers.conf usage", func() {
-
 	BeforeEach(func() {
 		confPath, err := filepath.Abs("config/containers.conf")
 		Expect(err).ToNot(HaveOccurred())
 		os.Setenv("CONTAINERS_CONF", confPath)
 		if IsRemote() {
 			podmanTest.RestartRemoteService()
 		}
-
 	})
 
 	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()
@@ -55,11 +52,9 @@ var _ = Describe("Verify podman containers.conf usage", func() {
 		} else {
 			Expect(session.OutputToString()).To(Not(Equal("500")))
 		}
-
 	})
 
 	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()
@@ -85,15 +80,10 @@ var _ = Describe("Verify podman containers.conf usage", func() {
 			} else {
 				Expect(session.OutputToString()).To(ContainSubstring("0"))
 			}
-
 		}
-
 	})
 
 	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 +142,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 +187,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()
@@ -812,7 +800,6 @@ var _ = Describe("Verify podman containers.conf usage", func() {
 	}
 
 	It("podman containers.conf container_name_as_hostname", func() {
-
 		// With default containers.conf
 
 		// Start container with no options

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()

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"

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()

test/e2e/generate_spec_test.go

@@ -8,7 +8,6 @@ import (
 	. "github.com/containers/podman/v5/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())
@@ -61,11 +58,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())
 	})
 })