diff --git a/test/e2e_node/cgroup_manager_test.go b/test/e2e_node/cgroup_manager_test.go index ba62f9df2d3..bf20dc8f2d4 100644 --- a/test/e2e_node/cgroup_manager_test.go +++ b/test/e2e_node/cgroup_manager_test.go @@ -25,7 +25,7 @@ import ( . "github.com/onsi/gomega" ) -var _ = framework.KubeDescribe("Kubelet Cgroup Manager", func() { +var _ = framework.KubeDescribe("Kubelet Cgroup Manager [Skip]", func() { f := framework.NewDefaultFramework("kubelet-cgroup-manager") Describe("QOS containers", func() { Context("On enabling QOS cgroup hierarchy", func() { diff --git a/test/e2e_node/e2e_service.go b/test/e2e_node/e2e_service.go index ed1845b7272..45aa8906dd5 100644 --- a/test/e2e_node/e2e_service.go +++ b/test/e2e_node/e2e_service.go @@ -253,6 +253,8 @@ func (es *e2eService) startKubeletServer() (*killCmd, error) { cmdArgs = append(cmdArgs, "--runtime-cgroups=/docker-daemon", "--kubelet-cgroups=/kubelet", + "--cgroup-root=/", + "--system-cgroups=/system", ) } cmdArgs = append(cmdArgs, @@ -273,7 +275,6 @@ func (es *e2eService) startKubeletServer() (*killCmd, error) { if es.cgroupsPerQOS { cmdArgs = append(cmdArgs, "--cgroups-per-qos", "true", - "--cgroup-root", "/", ) } if !*disableKubenet { diff --git a/test/e2e_node/jenkins/jenkins-ci.properties b/test/e2e_node/jenkins/jenkins-ci.properties index c38e85c68a1..8bdd9f2bc01 100644 --- a/test/e2e_node/jenkins/jenkins-ci.properties +++ b/test/e2e_node/jenkins/jenkins-ci.properties @@ -5,4 +5,4 @@ GCE_PROJECT=kubernetes-jenkins CLEANUP=true GINKGO_FLAGS='--skip="\[Flaky\]|\[Serial\]"' SETUP_NODE=false -TEST_ARGS=--cgroups-per-qos=true +TEST_ARGS=--cgroups-per-qos=false diff --git a/test/e2e_node/jenkins/jenkins-pull.properties b/test/e2e_node/jenkins/jenkins-pull.properties index e766adb9585..2381306a7d5 100644 --- a/test/e2e_node/jenkins/jenkins-pull.properties +++ b/test/e2e_node/jenkins/jenkins-pull.properties @@ -5,4 +5,4 @@ GCE_PROJECT=k8s-jkns-pr-node-e2e CLEANUP=true GINKGO_FLAGS='--skip="\[Flaky\]|\[Slow\]|\[Serial\]" --flakeAttempts=2' SETUP_NODE=false -TEST_ARGS=--cgroups-per-qos=true +TEST_ARGS=--cgroups-per-qos=false diff --git a/test/e2e_node/jenkins/jenkins-serial.properties b/test/e2e_node/jenkins/jenkins-serial.properties index ca922d43f7a..63a1105a664 100644 --- a/test/e2e_node/jenkins/jenkins-serial.properties +++ b/test/e2e_node/jenkins/jenkins-serial.properties @@ -5,5 +5,5 @@ GCE_PROJECT=kubernetes-jenkins CLEANUP=true GINKGO_FLAGS='--focus="\[Serial\]" --skip="\[Flaky\]"' SETUP_NODE=false -TEST_ARGS=--cgroups-per-qos=true +TEST_ARGS=--cgroups-per-qos=false PARALLELISM=1 diff --git a/test/e2e_node/jenkins/template.properties b/test/e2e_node/jenkins/template.properties index a15c9595564..1cb4c20e308 100644 --- a/test/e2e_node/jenkins/template.properties +++ b/test/e2e_node/jenkins/template.properties @@ -18,4 +18,4 @@ CLEANUP=true # If true, current user will be added to the docker group on test node SETUP_NODE=false # If true QoS Cgroup Hierarchy is created and tests specifc to the cgroup hierarchy run -TEST_ARGS=--cgroups-per-qos=true +TEST_ARGS=--cgroups-per-qos=false