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

Configurations of jenkins e2e cluster and default private e2e cluster made consistent.

Browse Source 
Configurations of jenkins e2e cluster and default private e2e cluster made consistent.
This commit is contained in:
Jerzy Szczepkowski
2015-09-01 13:47:17 +02:00
parent b2cfb8cb8e
commit 2684018bb5
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/gce/config-test.sh
View File

@@ -18,9 +18,9 @@
# gcloud multiplexing for shared GCE/GKE tests.
GCLOUD=gcloud
ZONE=${KUBE_GCE_ZONE:-us-central1-b}
MASTER_SIZE=${MASTER_SIZE:-n1-standard-1}
MINION_SIZE=${MINION_SIZE:-n1-standard-1}
NUM_MINIONS=${NUM_MINIONS:-2}
MASTER_SIZE=${MASTER_SIZE:-n1-standard-2}
MINION_SIZE=${MINION_SIZE:-n1-standard-2}
NUM_MINIONS=${NUM_MINIONS:-3}
MASTER_DISK_TYPE=pd-ssd
MASTER_DISK_SIZE=${MASTER_DISK_SIZE:-20GB}
MINION_DISK_TYPE=pd-standard

3
hack/jenkins/e2e.sh
View File

@@ -69,9 +69,6 @@ if [[ ${JOB_NAME} =~ ^kubernetes-.*-gce ]]; then
KUBERNETES_PROVIDER="gce"
: ${E2E_MIN_STARTUP_PODS:="1"}
: ${E2E_ZONE:="us-central1-f"}
: ${MASTER_SIZE:="n1-standard-2"}
: ${MINION_SIZE:="n1-standard-2"}
: ${NUM_MINIONS:="3"}
: ${NUM_MINIONS_PARALLEL:="6"} # Number of nodes required to run all of the tests in parallel
fi