scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23115 from wojtek-t/run_load_on_large_clusters

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-03-17 06:28:41 -07:00
parent 4e67d9606c 5db751f72c
commit 7a66db5808
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-e2e-gce-enormous-startup.yaml
View File

@@ -18,7 +18,7 @@
# Temporarily switch of Heapster, as this will not schedule anywhere.
# TODO: Think of a solution to enable it.
export KUBE_ENABLE_CLUSTER_MONITORING="none"
export KUBE_GCE_ZONE="us-central1-c"
export KUBE_GCE_ZONE="asia-east1-a"
export MASTER_SIZE="n1-standard-32"
export NODE_SIZE="n1-standard-1"
export NODE_DISK_SIZE="50GB"

6
hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-e2e.yaml
View File

@@ -584,9 +584,7 @@
job-env: |
# XXX Not a unique project
export E2E_NAME="e2e-enormous-cluster"
# TODO: Currently run only density test.
# Once this is stable, run the whole [Performance] suite.
export GINKGO_TEST_ARGS="--ginkgo.focus=starting\s30\spods\sper\snode"
export GINKGO_TEST_ARGS="--ginkgo.focus=\[Feature:Performance\]
export PROJECT="kubernetes-scale"
export FAIL_ON_GCP_RESOURCE_LEAK="false"
# Override GCE defaults.
@@ -594,7 +592,7 @@
# Temporarily switch of Heapster, as this will not schedule anywhere.
# TODO: Think of a solution to enable it.
export KUBE_ENABLE_CLUSTER_MONITORING="none"
export KUBE_GCE_ZONE="asia-east1-a"
export KUBE_GCE_ZONE="us-central1-c"
export MASTER_SIZE="n1-standard-32"
export NODE_SIZE="n1-standard-1"
export NODE_DISK_SIZE="50GB"