From c1a05024878083bf225b13bb1e1b383c68b98634 Mon Sep 17 00:00:00 2001
From: Yu-Ju Hong <yjhong@google.com>
Date: Mon, 7 Dec 2015 15:26:30 -0800
Subject: [PATCH] Change the kubelet --max-pods limit to 110 for test clusters

This allows resource usage monitoring test to launch 100 test pods per node, in
addition to the add-on pods.

Also reduce the test time length since the results over the shorter period are
representative enough.
---
 cluster/gce/config-test.sh | 2 +-
 hack/jenkins/e2e.sh        | 4 ++--
 test/e2e/kubelet_perf.go   | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh
index 55909e1c547..7a452158b8e 100755
--- a/cluster/gce/config-test.sh
+++ b/cluster/gce/config-test.sh
@@ -71,7 +71,7 @@ ENABLE_CLUSTER_MONITORING="${KUBE_ENABLE_CLUSTER_MONITORING:-influxdb}"
 TEST_CLUSTER_LOG_LEVEL="${TEST_CLUSTER_LOG_LEVEL:---v=4}"
 TEST_CLUSTER_RESYNC_PERIOD="${TEST_CLUSTER_RESYNC_PERIOD:---min-resync-period=3m}"
 
-KUBELET_TEST_ARGS="--max-pods=100 $TEST_CLUSTER_LOG_LEVEL"
+KUBELET_TEST_ARGS="--max-pods=110 $TEST_CLUSTER_LOG_LEVEL"
 APISERVER_TEST_ARGS="--runtime-config=extensions/v1beta1 ${TEST_CLUSTER_LOG_LEVEL}"
 CONTROLLER_MANAGER_TEST_ARGS="${TEST_CLUSTER_LOG_LEVEL} ${TEST_CLUSTER_RESYNC_PERIOD}"
 SCHEDULER_TEST_ARGS="${TEST_CLUSTER_LOG_LEVEL}"
diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh
index 60029227c64..20296ab3b1a 100755
--- a/hack/jenkins/e2e.sh
+++ b/hack/jenkins/e2e.sh
@@ -275,7 +275,7 @@ GKE_REQUIRED_SKIP_TESTS=(
     "Nodes"
     "Etcd\sFailure"
     "MasterCerts"
-    "experimental\sresource\susage\stracking" # Expect --max-pods=100
+    "experimental\sresource\susage\stracking" # Expect --max-pods=110
     "ServiceLoadBalancer" # issue: #16602
     "Shell"
     # Alpha features, remove from skip when these move to beta
@@ -298,7 +298,7 @@ GKE_DEFAULT_SKIP_TESTS=(
 
 # Tests which cannot be run on AWS.
 AWS_REQUIRED_SKIP_TESTS=(
-    "experimental\sresource\susage\stracking" # Expect --max-pods=100
+    "experimental\sresource\susage\stracking" # Expect --max-pods=110
     "GCE\sL7\sLoadBalancer\sController" # GCE L7 loadbalancing
 )
 
diff --git a/test/e2e/kubelet_perf.go b/test/e2e/kubelet_perf.go
index 8260307e2f5..9643c75a600 100644
--- a/test/e2e/kubelet_perf.go
+++ b/test/e2e/kubelet_perf.go
@@ -33,7 +33,7 @@ const (
 	// Interval to poll /stats/container on a node
 	containerStatsPollingPeriod = 10 * time.Second
 	// The monitoring time for one test.
-	monitoringTime = 30 * time.Minute
+	monitoringTime = 20 * time.Minute
 	// The periodic reporting period.
 	reportingPeriod = 5 * time.Minute
 )
@@ -118,7 +118,7 @@ var _ = Describe("Kubelet", func() {
 	})
 
 	Describe("regular resource usage tracking", func() {
-		density := []int{0, 35}
+		density := []int{0, 40}
 		for i := range density {
 			podsPerNode := density[i]
 			name := fmt.Sprintf(
@@ -129,7 +129,7 @@ var _ = Describe("Kubelet", func() {
 		}
 	})
 	Describe("experimental resource usage tracking", func() {
-		density := []int{50}
+		density := []int{100}
 		for i := range density {
 			podsPerNode := density[i]
 			name := fmt.Sprintf(