Merge pull request #14972 from edsantiago/ubuntu_cgroups_v1

Bump VMs, to Ubuntu 2204 with cgroups v1

1 files changed, 6 insertions, 1 deletions

diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go
index 6edb705a1..64b70f1ee 100644
--- a/test/e2e/run_test.go
+++ b/test/e2e/run_test.go
@@ -91,7 +91,8 @@ var _ = Describe("Podman run", func() {
 		if exitCode == 0 {
 			Expect(session.OutputToString()).To(ContainSubstring("aarch64"))
 		} else {
-			Expect(session.ErrorToString()).To(ContainSubstring("Exec format error"))
+			// crun says 'Exec', runc says 'exec'. Handle either.
+			Expect(session.ErrorToString()).To(ContainSubstring("xec format error"))
 		}
 	})
 
@@ -714,6 +715,7 @@ USER bin`, BB)
 	})
 
 	It("podman run device-read-bps test", func() {
+		SkipIfCgroupV1("FIXME: #15035 - bps broken")
 		SkipIfRootless("FIXME: requested cgroup controller `io` is not available")
 		SkipIfRootlessCgroupsV1("Setting device-read-bps not supported on cgroupv1 for rootless users")
 
@@ -733,6 +735,7 @@ USER bin`, BB)
 	})
 
 	It("podman run device-write-bps test", func() {
+		SkipIfCgroupV1("FIXME: #15035 - bps broken")
 		SkipIfRootless("FIXME: requested cgroup controller `io` is not available")
 		SkipIfRootlessCgroupsV1("Setting device-write-bps not supported on cgroupv1 for rootless users")
 
@@ -751,6 +754,7 @@ USER bin`, BB)
 	})
 
 	It("podman run device-read-iops test", func() {
+		SkipIfCgroupV1("FIXME: #15035 - bps broken")
 		SkipIfRootless("FIXME: requested cgroup controller `io` is not available")
 		SkipIfRootlessCgroupsV1("Setting device-read-iops not supported on cgroupv1 for rootless users")
 		var session *PodmanSessionIntegration
@@ -769,6 +773,7 @@ USER bin`, BB)
 	})
 
 	It("podman run device-write-iops test", func() {
+		SkipIfCgroupV1("FIXME: #15035 - bps broken")
 		SkipIfRootless("FIXME: requested cgroup controller `io` is not available")
 		SkipIfRootlessCgroupsV1("Setting device-write-iops not supported on cgroupv1 for rootless users")
 		var session *PodmanSessionIntegration