From 3a18af8ea8a823bfc47c449b9e2626672d2c2d85 Mon Sep 17 00:00:00 2001
From: Piotr Szczesniak <pszczesniak@google.com>
Date: Tue, 29 Sep 2015 15:52:30 +0200
Subject: [PATCH] Fixed flakiness in autoscaling e2e with no scheduling pods

---
 test/e2e/autoscaling.go       |  6 +++---
 test/e2e/autoscaling_utils.go | 18 ++++++++++--------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/test/e2e/autoscaling.go b/test/e2e/autoscaling.go
index 56bb1fca0e5..2c89f9c322a 100644
--- a/test/e2e/autoscaling.go
+++ b/test/e2e/autoscaling.go
@@ -53,10 +53,10 @@ var _ = Describe("Autoscaling", func() {
 	})
 
 	It("[Skipped][Autoscaling Suite] should scale cluster size based on cpu utilization", func() {
-		setUpAutoscaler("cpu/node_utilization", 0.5, nodeCount, nodeCount+1)
+		setUpAutoscaler("cpu/node_utilization", 0.4, nodeCount, nodeCount+1)
 
-		// Consume 60% CPU
-		millicoresPerReplica := 600
+		// Consume 50% CPU
+		millicoresPerReplica := 500
 		rc := NewStaticResourceConsumer("cpu-utilization", nodeCount*coresPerNode, millicoresPerReplica*nodeCount*coresPerNode, 0, int64(millicoresPerReplica), 100, f)
 		expectNoError(waitForClusterSize(f.Client, nodeCount+1, 20*time.Minute))
 
diff --git a/test/e2e/autoscaling_utils.go b/test/e2e/autoscaling_utils.go
index fb961da1705..1b5f49a0e34 100644
--- a/test/e2e/autoscaling_utils.go
+++ b/test/e2e/autoscaling_utils.go
@@ -260,14 +260,16 @@ func runServiceAndRCForResourceConsumer(c *client.Client, ns, name string, repli
 	})
 	expectNoError(err)
 	config := RCConfig{
-		Client:    c,
-		Image:     image,
-		Name:      name,
-		Namespace: ns,
-		Timeout:   timeoutRC,
-		Replicas:  replicas,
-		CpuLimit:  cpuLimitMillis,
-		MemLimit:  memLimitMb * 1024 * 1024, // MemLimit is in bytes
+		Client:     c,
+		Image:      image,
+		Name:       name,
+		Namespace:  ns,
+		Timeout:    timeoutRC,
+		Replicas:   replicas,
+		CpuRequest: cpuLimitMillis,
+		CpuLimit:   cpuLimitMillis,
+		MemRequest: memLimitMb * 1024 * 1024, // MemLimit is in bytes
+		MemLimit:   memLimitMb * 1024 * 1024,
 	}
 	expectNoError(RunRC(config))
 	// Make sure endpoints are propagated.