From c06c3705926e41cc5474d91ea03aea37f4b80c07 Mon Sep 17 00:00:00 2001 From: Wojciech Tyczynski Date: Thu, 23 Jul 2015 15:55:21 +0200 Subject: [PATCH] Revert "Require at least one healthy startup pod in GCE Jenkins e2e tests" --- hack/ginkgo-e2e.sh | 1 - hack/jenkins/e2e.sh | 2 -- 2 files changed, 3 deletions(-) diff --git a/hack/ginkgo-e2e.sh b/hack/ginkgo-e2e.sh index 402281790c0..ad394dcee07 100755 --- a/hack/ginkgo-e2e.sh +++ b/hack/ginkgo-e2e.sh @@ -100,6 +100,5 @@ export PATH=$(dirname "${e2e_test}"):"${PATH}" --node-instance-group="${NODE_INSTANCE_GROUP:-}" \ --num-nodes="${NUM_MINIONS:-}" \ --prefix="${KUBE_GCE_INSTANCE_PREFIX:-e2e}" \ - ${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 79c53616a81..f98ce20c5de 100755 --- a/hack/jenkins/e2e.sh +++ b/hack/jenkins/e2e.sh @@ -55,7 +55,6 @@ 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"} @@ -261,7 +260,6 @@ 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:-}