summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKubernetes Submit Queue <k8s-merge-robot@users.noreply.github.com>2017-10-30 18:08:38 -0700
committerGitHub <noreply@github.com>2017-10-30 18:08:38 -0700
commitdbfce3daccacf812947064d2a56ee7e31f6de9a1 (patch)
tree1bfbc5bdc40a1add13b1d175c7da1f44c1aed2a9
parenta289a0f21d80747b3a719a071cdc205dec18dcb0 (diff)
parent8a23742b3546c0ff4fff50e83d362c125ec11b3b (diff)
Merge pull request #1296 from yanxuean/qoscgroup
Automatic merge from submit-queue. correct the arg of kubelet in test-e2e-node Signed-off-by: yanxuean <yan.xuean@zte.com.cn> The --experimental-cgroups-per-qos is outdated. The arg is renamed since 1.6.0. See 1.6.0 changelog. https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.6.md Rename --experiemental-cgroups-per-qos to --cgroups-per-qos (#39972,)
-rw-r--r--contributors/devel/e2e-node-tests.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/contributors/devel/e2e-node-tests.md b/contributors/devel/e2e-node-tests.md
index 8bbf2dd7..734b190d 100644
--- a/contributors/devel/e2e-node-tests.md
+++ b/contributors/devel/e2e-node-tests.md
@@ -210,10 +210,10 @@ make test-e2e-node TEST_ARGS='--kubelet-flags="--network-plugin= --network-plugi
## Additional QoS Cgroups Hierarchy level testing
-For testing with the QoS Cgroup Hierarchy enabled, you can pass --experimental-cgroups-per-qos flag as an argument into Ginkgo using TEST_ARGS
+For testing with the QoS Cgroup Hierarchy enabled, you can pass --cgroups-per-qos flag as an argument into Ginkgo using TEST_ARGS
```sh
-make test_e2e_node TEST_ARGS="--experimental-cgroups-per-qos=true"
+make test_e2e_node TEST_ARGS="--cgroups-per-qos=true"
```
# Notes on tests run by the Kubernetes project during pre-, post- submit.