From 2684018bb5f754a88df5e5eec514a1fb33d043a2 Mon Sep 17 00:00:00 2001
From: Jerzy Szczepkowski <jsz@google.com>
Date: Tue, 1 Sep 2015 13:47:17 +0200
Subject: [PATCH] Configurations of jenkins e2e cluster and default private e2e
 cluster made consistent.

Configurations of jenkins e2e cluster and default private e2e cluster made consistent.
---
 cluster/gce/config-test.sh | 6 +++---
 hack/jenkins/e2e.sh        | 3 ---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh
index 4f3930caf34..5bb1902e2bf 100755
--- a/cluster/gce/config-test.sh
+++ b/cluster/gce/config-test.sh
@@ -18,9 +18,9 @@
 # gcloud multiplexing for shared GCE/GKE tests.
 GCLOUD=gcloud
 ZONE=${KUBE_GCE_ZONE:-us-central1-b}
-MASTER_SIZE=${MASTER_SIZE:-n1-standard-1}
-MINION_SIZE=${MINION_SIZE:-n1-standard-1}
-NUM_MINIONS=${NUM_MINIONS:-2}
+MASTER_SIZE=${MASTER_SIZE:-n1-standard-2}
+MINION_SIZE=${MINION_SIZE:-n1-standard-2}
+NUM_MINIONS=${NUM_MINIONS:-3}
 MASTER_DISK_TYPE=pd-ssd
 MASTER_DISK_SIZE=${MASTER_DISK_SIZE:-20GB}
 MINION_DISK_TYPE=pd-standard
diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh
index 47403915057..c39195f7c85 100755
--- a/hack/jenkins/e2e.sh
+++ b/hack/jenkins/e2e.sh
@@ -69,9 +69,6 @@ if [[ ${JOB_NAME} =~ ^kubernetes-.*-gce ]]; then
   KUBERNETES_PROVIDER="gce"
   : ${E2E_MIN_STARTUP_PODS:="1"}
   : ${E2E_ZONE:="us-central1-f"}
-  : ${MASTER_SIZE:="n1-standard-2"}
-  : ${MINION_SIZE:="n1-standard-2"}
-  : ${NUM_MINIONS:="3"}
   : ${NUM_MINIONS_PARALLEL:="6"}  # Number of nodes required to run all of the tests in parallel
 fi