scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #30415 from dchen1107/test1

Browse Source 
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
parent d2543c30d8 f21960a0f6
commit cb16c07736
6 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e_node/cgroup_manager_test.go
View File

@@ -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() {

3
test/e2e_node/e2e_service.go
View File

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

2
test/e2e_node/jenkins/jenkins-ci.properties
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

2
test/e2e_node/jenkins/jenkins-pull.properties
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

2
test/e2e_node/jenkins/jenkins-serial.properties
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

2
test/e2e_node/jenkins/template.properties
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