Fix e2e-internal scripts for cluster-size and watch-events

Fixes #4340
pull/6/head
Zach Loafman 2015-02-11 12:44:29 -08:00
parent 6c15604ccb
commit 9257b58e68
3 changed files with 5 additions and 5 deletions

View File

@ -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

View File

@ -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

View File

@ -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")
}