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

Merge pull request #9678 from dchen1107/podstatus

Browse Source 
Using bigger node for minions for jenkin-e2e tests.
This commit is contained in:
Quinton Hoole
2015-06-11 14:13:54 -07:00
parent c8876efa31 a1065d1e24
commit ec0dd2db00
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hack/jenkins/e2e.sh
View File

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