diff --git a/test/e2e_node/jenkins/benchmark/jenkins-benchmark.properties b/test/e2e_node/jenkins/benchmark/jenkins-benchmark.properties index d07b60cf833..774110a7fbf 100644 --- a/test/e2e_node/jenkins/benchmark/jenkins-benchmark.properties +++ b/test/e2e_node/jenkins/benchmark/jenkins-benchmark.properties @@ -5,5 +5,5 @@ GCE_PROJECT=k8s-jkns-ci-node-e2e CLEANUP=true GINKGO_FLAGS='--skip="\[Flaky\]"' TEST_ARGS='--feature-gates=DynamicKubeletConfig=true' -KUBELET_ARGS='--experimental-cgroups-per-qos=true --cgroup-root=/' +KUBELET_ARGS='--cgroups-per-qos=false --cgroup-root=/' PARALLELISM=1 diff --git a/test/e2e_node/jenkins/conformance/jenkins-conformance.properties b/test/e2e_node/jenkins/conformance/jenkins-conformance.properties index f465d8081a9..f1ca88b2d6d 100644 --- a/test/e2e_node/jenkins/conformance/jenkins-conformance.properties +++ b/test/e2e_node/jenkins/conformance/jenkins-conformance.properties @@ -3,4 +3,4 @@ GCE_IMAGE_CONFIG_PATH=test/e2e_node/jenkins/image-config.yaml GCE_ZONE=us-central1-f GCE_PROJECT=k8s-jkns-ci-node-e2e CLEANUP=true -KUBELET_ARGS='--experimental-cgroups-per-qos=true --cgroup-root=/' +KUBELET_ARGS='--cgroups-per-qos=false --cgroup-root=/' diff --git a/test/e2e_node/jenkins/jenkins-ci.properties b/test/e2e_node/jenkins/jenkins-ci.properties index 31330487733..9c563b6a050 100644 --- a/test/e2e_node/jenkins/jenkins-ci.properties +++ b/test/e2e_node/jenkins/jenkins-ci.properties @@ -4,5 +4,5 @@ GCE_ZONE=us-central1-f GCE_PROJECT=k8s-jkns-ci-node-e2e CLEANUP=true GINKGO_FLAGS='--skip="\[Flaky\]|\[Serial\]"' -KUBELET_ARGS='--experimental-cgroups-per-qos=true --cgroup-root=/' +KUBELET_ARGS='--cgroups-per-qos=true --cgroup-root=/' TIMEOUT=1h diff --git a/test/e2e_node/jenkins/jenkins-flaky.properties b/test/e2e_node/jenkins/jenkins-flaky.properties index 737533e0a92..363b059b246 100644 --- a/test/e2e_node/jenkins/jenkins-flaky.properties +++ b/test/e2e_node/jenkins/jenkins-flaky.properties @@ -5,4 +5,4 @@ GCE_PROJECT=k8s-jkns-ci-node-e2e CLEANUP=true GINKGO_FLAGS='--focus="\[Flaky\]"' TEST_ARGS='--feature-gates=DynamicKubeletConfig=true' -KUBELET_ARGS='--experimental-cgroups-per-qos=true --cgroup-root=/' +KUBELET_ARGS='--cgroups-per-qos=true --cgroup-root=/' \ No newline at end of file diff --git a/test/e2e_node/jenkins/jenkins-pull.properties b/test/e2e_node/jenkins/jenkins-pull.properties index d727b590dc3..884e45884f1 100644 --- a/test/e2e_node/jenkins/jenkins-pull.properties +++ b/test/e2e_node/jenkins/jenkins-pull.properties @@ -4,5 +4,5 @@ GCE_ZONE=us-central1-f GCE_PROJECT=k8s-jkns-pr-node-e2e CLEANUP=true GINKGO_FLAGS='--skip="\[Flaky\]|\[Slow\]|\[Serial\]" --flakeAttempts=2' -KUBELET_ARGS='--experimental-cgroups-per-qos=true --cgroup-root=/' +KUBELET_ARGS='--cgroups-per-qos=true --cgroup-root=/' diff --git a/test/e2e_node/jenkins/jenkins-serial.properties b/test/e2e_node/jenkins/jenkins-serial.properties index acaafc45d26..892fa27afca 100644 --- a/test/e2e_node/jenkins/jenkins-serial.properties +++ b/test/e2e_node/jenkins/jenkins-serial.properties @@ -5,6 +5,6 @@ GCE_PROJECT=k8s-jkns-ci-node-e2e CLEANUP=true GINKGO_FLAGS='--focus="\[Serial\]" --skip="\[Flaky\]|\[Benchmark\]"' TEST_ARGS='--feature-gates=DynamicKubeletConfig=true' -KUBELET_ARGS='--experimental-cgroups-per-qos=true --cgroup-root=/' +KUBELET_ARGS='--cgroups-per-qos=true --cgroup-root=/' PARALLELISM=1 TIMEOUT=3h diff --git a/test/e2e_node/jenkins/template.properties b/test/e2e_node/jenkins/template.properties index b23e5984055..bdc7cf6f55f 100644 --- a/test/e2e_node/jenkins/template.properties +++ b/test/e2e_node/jenkins/template.properties @@ -20,6 +20,6 @@ CLEANUP=true # KUBELET_ARGS are the arguments passed to kubelet. The args will override corresponding default kubelet # setting in the test framework and --kubelet-flags in TEST_ARGS. # If true QoS Cgroup Hierarchy is created and tests specifc to the cgroup hierarchy run -KUBELET_ARGS='--experimental-cgroups-per-qos=true --cgroup-root=/' +KUBELET_ARGS='--cgroups-per-qos=true --cgroup-root=/' # TEST_ARGS are args passed to node e2e test. TEST_ARGS=''