From cf02d8cef2f6071bb12276c37350eaa0dcbe027c Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Mon, 13 Apr 2015 08:28:24 -0700 Subject: [PATCH] Specify equivalent instance types for AWS, in hack/jenkins/e2e.sh This should unbreak the AWS e2e tests --- hack/jenkins/e2e.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh index c04e7e29937..58c67bfda5e 100755 --- a/hack/jenkins/e2e.sh +++ b/hack/jenkins/e2e.sh @@ -41,13 +41,21 @@ fi GINKGO_TEST_ARGS="" if [[ "${SCALABILITY:-}" == "true" ]]; then - export MASTER_SIZE="n1-standard-4" + if [[ "${KUBERNETES_PROVIDER}" == "aws" ]]; then + export MASTER_SIZE="m3.xlarge" + else + export MASTER_SIZE="n1-standard-4" + fi # TODO(wojtek-t): Once we have enough quota for the project, increase # NUM_MINIONS to 100 (which is our v1.0 goal). export NUM_MINIONS="10" GINKGO_TEST_ARGS="--ginkgo.focus=Density " else - export MASTER_SIZE="g1-small" + if [[ "${KUBERNETES_PROVIDER}" == "aws" ]]; then + export MASTER_SIZE="t2.small" + else + export MASTER_SIZE="g1-small" + fi export NUM_MINIONS="2" fi