Merge pull request #23426 from gmarek/master

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-03-24 05:34:56 -07:00
commit f89432e44b

View File

@ -54,22 +54,6 @@
export KUBE_GCE_ZONE="us-central1-f"
export KUBEMARK_MASTER_SIZE="n1-standard-1"
export KUBEMARK_NUM_NODES="5"
- 'gce':
description: 'Run Kubemark test on a fake 100 node cluster to have a comparison to the real results from scalability suite.'
timeout: 120
cron-string: '@hourly'
job-env: |
export PROJECT="k8s-jenkins-kubemark"
export E2E_TEST="false"
export USE_KUBEMARK="true"
export KUBEMARK_TESTS="\[Feature:Performance\]"
# Override defaults to be independent from GCE defaults and set kubemark parameters
export NUM_NODES="3"
export MASTER_SIZE="n1-standard-2"
export NODE_SIZE="n1-standard-4"
export KUBE_GCE_ZONE="us-central1-b"
export KUBEMARK_MASTER_SIZE="n1-standard-4"
export KUBEMARK_NUM_NODES="100"
- 'high-density-100-gce':
description: 'Run Kubemark high-density (100 pods/node) test on a fake 100 node cluster.'
timeout: 160