From af9a922d6e824c40d64599f2a5e6f5d204da3876 Mon Sep 17 00:00:00 2001 From: Jeff Grafton Date: Fri, 9 Sep 2016 15:19:57 -0700 Subject: [PATCH] e2e: only tear down existing cluster if it exists --- hack/e2e.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hack/e2e.go b/hack/e2e.go index 5afe9dc72e5..d8a9125d030 100644 --- a/hack/e2e.go +++ b/hack/e2e.go @@ -94,7 +94,9 @@ func main() { } } - if *up { + // TODO: remove the IsUp() check after we stop testing 1.2 and earlier + // (or if we figure out a better way to handle TearDown failing on nonexisting clusters on old releases). + if *up && IsUp() { if err := TearDown(); err != nil { log.Fatalf("error tearing down previous cluster: %v", err) }