Merge pull request #24941 from gmarek/jenkins

Automatic merge from submit-queue

Move kubemark-100 to us-central
This commit is contained in:
k8s-merge-robot
2016-04-28 12:33:29 -07:00

View File

@@ -57,7 +57,7 @@
export KUBEMARK_MASTER_SIZE="n1-standard-1"
export KUBEMARK_NUM_NODES="5"
- '100-gce':
description: 'Run small-ish kubemark cluster to continously run performance experiments'
description: 'Run small-ish kubemark cluster to continuously run performance experiments'
timeout: 240
cron-string: 'H H/6 * * *'
job-env: |
@@ -71,7 +71,7 @@
export NUM_NODES="3"
export MASTER_SIZE="n1-standard-2"
export NODE_SIZE="n1-standard-4"
export KUBE_GCE_ZONE="us-east1-d"
export KUBE_GCE_ZONE="us-central1-d"
export KUBEMARK_MASTER_SIZE="n1-standard-4"
export KUBEMARK_NUM_NODES="100"
- 'high-density-100-gce':