diff --git a/hack/ginkgo-e2e.sh b/hack/ginkgo-e2e.sh index ad394dcee0..d7e1b608f8 100755 --- a/hack/ginkgo-e2e.sh +++ b/hack/ginkgo-e2e.sh @@ -100,5 +100,6 @@ export PATH=$(dirname "${e2e_test}"):"${PATH}" --node-instance-group="${NODE_INSTANCE_GROUP:-}" \ --num-nodes="${NUM_MINIONS:-}" \ --prefix="${KUBE_GCE_INSTANCE_PREFIX:-e2e}" \ - ${E2E_REPORT_DIR+"--report-dir=${E2E_REPORT_DIR}"} \ + ${E2E_MIN_STARTUP_PODS:+"--minStartupPods=${E2E_MIN_STARTUP_PODS}"} \ + ${E2E_REPORT_DIR:+"--report-dir=${E2E_REPORT_DIR}"} \ "${@:-}" diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh index c305fbeeb0..37fbc1744c 100755 --- a/hack/jenkins/e2e.sh +++ b/hack/jenkins/e2e.sh @@ -67,6 +67,7 @@ E2E_OPT=${E2E_OPT:-""} # Set environment variables shared for all of the GCE Jenkins projects. 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"} @@ -272,6 +273,7 @@ export ZONE=${E2E_ZONE} export KUBE_GKE_NETWORK=${E2E_NETWORK} # Shared cluster variables +export E2E_MIN_STARTUP_PODS=${E2E_MIN_STARTUP_PODS:-} export MASTER_SIZE=${MASTER_SIZE:-} export MINION_SIZE=${MINION_SIZE:-} export NUM_MINIONS=${NUM_MINIONS:-}