Merge pull request #18648 from gmarek/master

Move Kubmark tests to us-east1-b, to make space for enormous cluster …
This commit is contained in:
Filip Grzadkowski 2015-12-14 14:29:43 +01:00
commit b85aa16fb0

View File

@ -1035,7 +1035,7 @@ case ${JOB_NAME} in
MASTER_SIZE="n1-standard-4" MASTER_SIZE="n1-standard-4"
NODE_SIZE="n1-standard-8" NODE_SIZE="n1-standard-8"
KUBE_GCE_INSTANCE_PREFIX="kubemark500" KUBE_GCE_INSTANCE_PREFIX="kubemark500"
E2E_ZONE="asia-east1-a" E2E_ZONE="us-east1-b"
KUBEMARK_MASTER_SIZE="n1-standard-16" KUBEMARK_MASTER_SIZE="n1-standard-16"
KUBEMARK_NUM_NODES="500" KUBEMARK_NUM_NODES="500"
;; ;;
@ -1057,7 +1057,7 @@ case ${JOB_NAME} in
# so NUM_NODES x cores_per_node should # so NUM_NODES x cores_per_node should
# be set accordingly. # be set accordingly.
KUBE_GCE_INSTANCE_PREFIX="kubemark1000" KUBE_GCE_INSTANCE_PREFIX="kubemark1000"
E2E_ZONE="asia-east1-a" E2E_ZONE="us-east1-b"
KUBEMARK_MASTER_SIZE="n1-standard-16" KUBEMARK_MASTER_SIZE="n1-standard-16"
KUBEMARK_NUM_NODES="1000" KUBEMARK_NUM_NODES="1000"
;; ;;