From e249a6197f75caeabcb4a7017063ea0b86bc4594 Mon Sep 17 00:00:00 2001
From: Piotr Kazmierczak <470696+pkazmierczak@users.noreply.github.com>
Date: Wed, 19 Mar 2025 16:53:37 +0100
Subject: [PATCH] docker: TestDockerDriver_OOMKilled should now run on cgroups
 v2 (#25443)

Docker driver's TestDockerDriver_OOMKilled should run on cgroups v2 now, since
we're running docker v27 client library and our runners run docker v26 that
contain containerd fix containerd/containerd#6323.
---
 drivers/docker/driver_test.go | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/docker/driver_test.go b/drivers/docker/driver_test.go
index d9c05da61..2ac114766 100644
--- a/drivers/docker/driver_test.go
+++ b/drivers/docker/driver_test.go
@@ -2576,9 +2576,7 @@ func TestDockerDriver_OOMKilled(t *testing.T) {
 	ci.Parallel(t)
 	testutil.DockerCompatible(t)
 
-	// waiting on upstream fix for cgroups v2
-	// see https://github.com/hashicorp/nomad/issues/13119
-	testutil.CgroupsCompatibleV1(t)
+	testutil.CgroupsCompatibleV2(t)
 
 	taskCfg := newTaskConfig("", []string{"sh", "-c", `sleep 2 && x=a && while true; do x="$x$x"; done`})
 	task := &drivers.TaskConfig{