github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Specify equivalent instance types for AWS, in hack/jenkins/e2e.sh

Browse Source 
This should unbreak the AWS e2e tests
This commit is contained in:
Justin Santa Barbara
2015-04-13 08:28:24 -07:00
parent 88cf777dfd
commit cf02d8cef2
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hack/jenkins/e2e.sh
View File

@@ -41,13 +41,21 @@ fi
GINKGO_TEST_ARGS="" GINKGO_TEST_ARGS=""
if [[ "${SCALABILITY:-}" == "true" ]]; then if [[ "${SCALABILITY:-}" == "true" ]]; then
if [[ "${KUBERNETES_PROVIDER}" == "aws" ]]; then
export MASTER_SIZE="m3.xlarge"
else
export MASTER_SIZE="n1-standard-4" export MASTER_SIZE="n1-standard-4"
fi
# TODO(wojtek-t): Once we have enough quota for the project, increase # TODO(wojtek-t): Once we have enough quota for the project, increase
# NUM_MINIONS to 100 (which is our v1.0 goal). # NUM_MINIONS to 100 (which is our v1.0 goal).
export NUM_MINIONS="10" export NUM_MINIONS="10"
GINKGO_TEST_ARGS="--ginkgo.focus=Density " GINKGO_TEST_ARGS="--ginkgo.focus=Density "
else else
if [[ "${KUBERNETES_PROVIDER}" == "aws" ]]; then
export MASTER_SIZE="t2.small"
else
export MASTER_SIZE="g1-small" export MASTER_SIZE="g1-small"
fi
export NUM_MINIONS="2" export NUM_MINIONS="2"
fi fi