apptainer · DrDaveD · Jun 23, 2025 · Jun 20, 2025 · Jun 20, 2025
diff --git a/e2e/cgroups/cgroups.go b/e2e/cgroups/cgroups.go
@@ -412,11 +412,12 @@ var resourceFlagTests = []resourceFlagTest{
 		controllerV1:    "cpu",
 		resourceV1:      "cpu.shares",
 		expectV1:        "123",
-		// Cgroups v2 has a conversion from shares to weight:
-		// weight = (1 + ((cpuShares-2)*9999)/262142)
+		// Cgroups v2 has a conversion from shares to weight. The formula has
+		// changed between opencontainer/cgroups versions, and runc / crun
+		// versions. See https://github.com/opencontainers/cgroups/pull/20
 		delegationV2: "cpu",
 		resourceV2:   "cpu.weight",
-		expectV2:     "5",
+		expectV2:     "5|20",
 	},
 	{
 		name:            "cpuset-cpus",
@@ -526,7 +527,7 @@ func (c *ctx) actionFlagV1(t *testing.T, tt resourceFlagTest, profile e2e.Profil
 
 	exitFunc := []e2e.ApptainerCmdResultOp{}
 	if tt.expectV1 != "" {
-		exitFunc = []e2e.ApptainerCmdResultOp{e2e.ExpectOutput(e2e.ContainMatch, tt.expectV1)}
+		exitFunc = []e2e.ApptainerCmdResultOp{e2e.ExpectOutput(e2e.RegexMatch, tt.expectV1)}
 	}
 
 	args := tt.args
@@ -556,7 +557,7 @@ func (c *ctx) actionFlagV2(t *testing.T, tt resourceFlagTest, profile e2e.Profil
 
 	exitFunc := []e2e.ApptainerCmdResultOp{}
 	if tt.expectV2 != "" {
-		exitFunc = []e2e.ApptainerCmdResultOp{e2e.ExpectOutput(e2e.ContainMatch, tt.expectV2)}
+		exitFunc = []e2e.ApptainerCmdResultOp{e2e.ExpectOutput(e2e.RegexMatch, tt.expectV2)}
 	}
 
 	// Use shell in the container to find container cgroup and cat the value for the tested controller & resource.
@@ -628,7 +629,7 @@ func (c *ctx) instanceFlagV1(t *testing.T, tt resourceFlagTest, profile e2e.Prof
 	shellCmd := fmt.Sprintf("cat /sys/fs/cgroup/%s$(cat /proc/self/cgroup | grep '[,:]%s[,:]' | cut -d ':' -f 3)/%s", tt.controllerV1, tt.controllerV1, tt.resourceV1)
 	exitFunc := []e2e.ApptainerCmdResultOp{}
 	if tt.expectV1 != "" {
-		exitFunc = []e2e.ApptainerCmdResultOp{e2e.ExpectOutput(e2e.ContainMatch, tt.expectV1)}
+		exitFunc = []e2e.ApptainerCmdResultOp{e2e.ExpectOutput(e2e.RegexMatch, tt.expectV1)}
 	}
 
 	c.env.RunApptainer(
@@ -684,7 +685,7 @@ func (c *ctx) instanceFlagV2(t *testing.T, tt resourceFlagTest, profile e2e.Prof
 	shellCmd := fmt.Sprintf("cat /sys/fs/cgroup$(cat /proc/self/cgroup | grep '^0::' | cut -d ':' -f 3)/%s", tt.resourceV2)
 	exitFunc := []e2e.ApptainerCmdResultOp{}
 	if tt.expectV2 != "" {
-		exitFunc = []e2e.ApptainerCmdResultOp{e2e.ExpectOutput(e2e.ContainMatch, tt.expectV2)}
+		exitFunc = []e2e.ApptainerCmdResultOp{e2e.ExpectOutput(e2e.RegexMatch, tt.expectV2)}
 	}
 
 	execProfile := profile

diff --git a/go.mod b/go.mod
@@ -27,7 +27,7 @@ require (
 	github.com/google/uuid v1.6.0
 	github.com/gosimple/slug v1.15.0
 	github.com/moby/go-archive v0.1.0
-	github.com/opencontainers/cgroups v0.0.2
+	github.com/opencontainers/cgroups v0.0.3
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.1.1
 	github.com/opencontainers/runc v1.3.0

diff --git a/go.sum b/go.sum
@@ -323,8 +323,8 @@ github.com/onsi/ginkgo/v2 v2.23.4/go.mod h1:Bt66ApGPBFzHyR+JO10Zbt0Gsp4uWxu5mIOT
 github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.37.0 h1:CdEG8g0S133B4OswTDC/5XPSzE1OeP29QOioj2PID2Y=
 github.com/onsi/gomega v1.37.0/go.mod h1:8D9+Txp43QWKhM24yyOBEdpkzN8FvJyAwecBgsU4KU0=
-github.com/opencontainers/cgroups v0.0.2 h1:A+mAPPMfgKNCEZUUtibESFx06uvhAmvo8sSz3Abwk7o=
-github.com/opencontainers/cgroups v0.0.2/go.mod h1:s8lktyhlGUqM7OSRL5P7eAW6Wb+kWPNvt4qvVfzA5vs=
+github.com/opencontainers/cgroups v0.0.3 h1:Jc9dWh/0YLGjdy6J/9Ln8NM5BfTA4W2BY0GMozy3aDU=
+github.com/opencontainers/cgroups v0.0.3/go.mod h1:s8lktyhlGUqM7OSRL5P7eAW6Wb+kWPNvt4qvVfzA5vs=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040=