Skip to content

K
k3s
Commit e1bfce85 authored by Piotr Szczesniak's avatar Piotr Szczesniak
Browse files
Options

Merge pull request #13439 from jszczepkowski/e2e-defaults

Consistent configurations of jenkins e2e cluster and default private e2e cluster.
parents 182632cd 2684018b
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 6 deletions
cluster/gce/config-test.sh
View file @ e1bfce85
...@@ -18,9 +18,9 @@ ...@@ -18,9 +18,9 @@
# gcloud multiplexing for shared GCE/GKE tests. # gcloud multiplexing for shared GCE/GKE tests.
GCLOUD=gcloud GCLOUD=gcloud
ZONE=${KUBE_GCE_ZONE:-us-central1-b} ZONE=${KUBE_GCE_ZONE:-us-central1-b}
MASTER_SIZE=${MASTER_SIZE:-n1-standard-1} MASTER_SIZE=${MASTER_SIZE:-n1-standard-2}
MINION_SIZE=${MINION_SIZE:-n1-standard-1} MINION_SIZE=${MINION_SIZE:-n1-standard-2}
NUM_MINIONS=${NUM_MINIONS:-2} NUM_MINIONS=${NUM_MINIONS:-3}
MASTER_DISK_TYPE=pd-ssd MASTER_DISK_TYPE=pd-ssd
MASTER_DISK_SIZE=${MASTER_DISK_SIZE:-20GB} MASTER_DISK_SIZE=${MASTER_DISK_SIZE:-20GB}
MINION_DISK_TYPE=pd-standard MINION_DISK_TYPE=pd-standard
......
hack/jenkins/e2e.sh
View file @ e1bfce85
...@@ -69,9 +69,6 @@ if [[ ${JOB_NAME} =~ ^kubernetes-.*-gce ]]; then ...@@ -69,9 +69,6 @@ if [[ ${JOB_NAME} =~ ^kubernetes-.*-gce ]]; then
KUBERNETES_PROVIDER="gce" KUBERNETES_PROVIDER="gce"
: ${E2E_MIN_STARTUP_PODS:="1"} : ${E2E_MIN_STARTUP_PODS:="1"}
: ${E2E_ZONE:="us-central1-f"} : ${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 : ${NUM_MINIONS_PARALLEL:="6"} # Number of nodes required to run all of the tests in parallel
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment