Merge pull request #9678 from dchen1107/podstatus

Using bigger node for minions for jenkin-e2e tests.
This commit is contained in:
Quinton Hoole 2015-06-11 14:13:54 -07:00
commit ec0dd2db00

View File

@ -45,6 +45,7 @@ if [[ "${PERFORMANCE:-}" == "true" ]]; then
export MASTER_SIZE=${MASTER_SIZE:-"m3.xlarge"}
else
export MASTER_SIZE=${MASTER_SIZE:-"n1-standard-4"}
export MINION_SIZE=${MINION_SIZE:-"n1-standard-2"}
fi
export NUM_MINIONS=${NUM_MINIONS:-"100"}
GINKGO_TEST_ARGS=${GINKGO_TEST_ARGS:-"--ginkgo.focus=\[Performance suite\] "}
@ -52,7 +53,8 @@ else
if [[ "${KUBERNETES_PROVIDER}" == "aws" ]]; then
export MASTER_SIZE=${MASTER_SIZE:-"t2.small"}
else
export MASTER_SIZE=${MASTER_SIZE:-"g1-small"}
export MASTER_SIZE=${MASTER_SIZE:-"n1-standard-2"}
export MINION_SIZE=${MINION_SIZE:-"n1-standard-2"}
fi
export NUM_MINIONS=${NUM_MINIONS:-"2"}
fi