Merge pull request #30415 from dchen1107/test1

Automatic merge from submit-queue

Fixed misconfigured kubelet on containervm image for node-e2e.

Fixed #30412 to unblock @coufon's performance benchmark work.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/30415)
<!-- Reviewable:end -->
This commit is contained in:
Kubernetes Submit Queue
2016-08-12 04:04:28 -07:00
committed by GitHub
6 changed files with 7 additions and 6 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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