From 9257b58e687760703bdba128accf1c6eb8f25c72 Mon Sep 17 00:00:00 2001 From: Zach Loafman Date: Wed, 11 Feb 2015 12:44:29 -0800 Subject: [PATCH] Fix e2e-internal scripts for cluster-size and watch-events Fixes #4340 --- hack/e2e-internal/e2e-cluster-size.sh | 4 +--- hack/e2e-internal/e2e-watch-events.sh | 4 +++- hack/e2e.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hack/e2e-internal/e2e-cluster-size.sh b/hack/e2e-internal/e2e-cluster-size.sh index c8309f73b1b..84886e5f97d 100755 --- a/hack/e2e-internal/e2e-cluster-size.sh +++ b/hack/e2e-internal/e2e-cluster-size.sh @@ -31,6 +31,4 @@ source "${KUBE_VERSION_ROOT}/cluster/${KUBERNETES_PROVIDER}/util.sh" prepare-e2e -while true; do - ${KUBECTL} --watch-only get events -done +${KUBECTL} get minions --no-headers | wc -l diff --git a/hack/e2e-internal/e2e-watch-events.sh b/hack/e2e-internal/e2e-watch-events.sh index 84886e5f97d..c8309f73b1b 100755 --- a/hack/e2e-internal/e2e-watch-events.sh +++ b/hack/e2e-internal/e2e-watch-events.sh @@ -31,4 +31,6 @@ source "${KUBE_VERSION_ROOT}/cluster/${KUBERNETES_PROVIDER}/util.sh" prepare-e2e -${KUBECTL} get minions --no-headers | wc -l +while true; do + ${KUBECTL} --watch-only get events +done diff --git a/hack/e2e.go b/hack/e2e.go index 4a828d588ba..33f0fa3cace 100644 --- a/hack/e2e.go +++ b/hack/e2e.go @@ -184,7 +184,7 @@ func Up() bool { // Ensure that the cluster is large engough to run the e2e tests. func ValidateClusterSize() { // Check that there are at least 3 minions running - res, stdout, _ := finishRunningWithOutputs("validate cluster size", exec.Command(path.Join(*root, "hack/e2e-internal/e2e-watch-events.sh"))) + res, stdout, _ := finishRunningWithOutputs("validate cluster size", exec.Command(path.Join(*root, "hack/e2e-internal/e2e-cluster-size.sh"))) if !res { log.Fatal("Could not get nodes to validate cluster size") }