From 1d2e2c0d3c1b135710a6918ef4ad044984d9d1ff Mon Sep 17 00:00:00 2001
From: Seth Hoenig <seth.a.hoenig@gmail.com>
Date: Tue, 5 Apr 2022 15:21:15 -0500
Subject: [PATCH] raw_exec: fixup review comments

---
 api/fs_test.go                              |  1 +
 api/nodes.go                                |  1 +
 client/lib/resources/containment_default.go | 11 -----------
 nomad/core_sched_test.go                    |  2 --
 4 files changed, 2 insertions(+), 13 deletions(-)
 delete mode 100644 client/lib/resources/containment_default.go

diff --git a/api/fs_test.go b/api/fs_test.go
index 9204484cb..449239f96 100644
--- a/api/fs_test.go
+++ b/api/fs_test.go
@@ -20,6 +20,7 @@ func TestFS_Logs(t *testing.T) {
 	testutil.Parallel(t)
 	require := require.New(t)
 	rpcPort := 0
+
 	c, s := makeClient(t, nil, func(c *testutil.TestServerConfig) {
 		rpcPort = c.Ports.RPC
 		c.Client = &testutil.ClientConfig{
diff --git a/api/nodes.go b/api/nodes.go
index 0a9ed2833..66b25a592 100644
--- a/api/nodes.go
+++ b/api/nodes.go
@@ -549,6 +549,7 @@ type Node struct {
 	Links                 map[string]string
 	Meta                  map[string]string
 	NodeClass             string
+	CgroupParent          string
 	Drain                 bool
 	DrainStrategy         *DrainStrategy
 	SchedulingEligibility string
diff --git a/client/lib/resources/containment_default.go b/client/lib/resources/containment_default.go
deleted file mode 100644
index 1f3ec38fa..000000000
--- a/client/lib/resources/containment_default.go
+++ /dev/null
@@ -1,11 +0,0 @@
-//go:build !linux
-
-package resources
-
-type containment struct {
-	// non-linux executors currently do not create resources to be cleaned up
-}
-
-func (c *containment) Cleanup() error {
-	return nil
-}
diff --git a/nomad/core_sched_test.go b/nomad/core_sched_test.go
index a0569b5b1..aa2d968fd 100644
--- a/nomad/core_sched_test.go
+++ b/nomad/core_sched_test.go
@@ -2244,8 +2244,6 @@ func TestCoreScheduler_CSIPluginGC(t *testing.T) {
 }
 
 func TestCoreScheduler_CSIVolumeClaimGC(t *testing.T) {
-	ci.SkipSlow(t, "flaky on GHA; #12358")
-
 	srv, shutdown := TestServer(t, func(c *Config) {
 		c.NumSchedulers = 0 // Prevent automatic dequeue
 	})