Merge pull request #7424 from cpuguy83/skip_shimcgroup

integration/client/client_test.go

@@ -46,11 +46,13 @@ var (
 	noDaemon     bool
 	noCriu       bool
 	supportsCriu bool
+	noShimCgroup bool
 )
 
 func init() {
 	flag.BoolVar(&noDaemon, "no-daemon", false, "Do not start a dedicated daemon for the tests")
 	flag.BoolVar(&noCriu, "no-criu", false, "Do not run the checkpoint tests")
+	flag.BoolVar(&noShimCgroup, "no-shim-cgroup", false, "Do not run the shim cgroup tests")
 }
 
 func TestMain(m *testing.M) {

integration/client/container_linux_test.go

@@ -160,6 +160,10 @@ func TestTaskUpdate(t *testing.T) {
 }
 
 func TestShimInCgroup(t *testing.T) {
+	if noShimCgroup {
+		t.Skip("shim cgroup is not enabled")
+	}
+
 	t.Parallel()
 
 	client, err := newClient(t, address)