From 2372c6d20c54fe50e793e6c8d086df3f0ee744c7 Mon Sep 17 00:00:00 2001 From: Seth Hoenig Date: Mon, 21 Nov 2022 12:41:55 -0600 Subject: [PATCH] e2e: fixup oversubscription test case for jammy (#15347) * e2e: fixup oversubscription test case for jammy jammy uses cgroups v2, need to lookup the max memory limit from the unified heirarchy format * e2e: set constraint to require cgroups v2 on oversub docker test --- e2e/oversubscription/testdata/docker.nomad | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/e2e/oversubscription/testdata/docker.nomad b/e2e/oversubscription/testdata/docker.nomad index 447de114f..109fad23b 100644 --- a/e2e/oversubscription/testdata/docker.nomad +++ b/e2e/oversubscription/testdata/docker.nomad @@ -7,6 +7,12 @@ job "oversubscription-docker" { value = "darwin,linux" } + constraint { + attribute = "${attr.unique.cgroup.version}" + operator = "=" + value = "v2" + } + group "group" { task "task" { driver = "docker" @@ -14,7 +20,7 @@ job "oversubscription-docker" { config { image = "busybox:1.29.2" command = "/bin/sh" - args = ["-c", "cat /sys/fs/cgroup/memory/memory.limit_in_bytes; sleep 1000"] + args = ["-c", "cat /sys/fs/cgroup/memory.max; sleep 1000"] } resources {