github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 10:43:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #32420 from ixdy/e2e-teardown-on-up

Browse Source 
Automatic merge from submit-queue

e2e: only tear down existing cluster if it exists

Jenkins won't actually test this change, since `e2e.go` is now sourced from `kubekins-e2e`. :(

Probably fixes https://github.com/kubernetes/test-infra/issues/539, once a new `kubekins-e2e` is pushed.

cc @maisem @davidopp
This commit is contained in:
Kubernetes Submit Queue 2016-09-09 16:15:31 -07:00 committed by GitHub
commit 57604d13cd
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hack/e2e.go
View File

@ -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 { if err := TearDown(); err != nil {
log.Fatalf("error tearing down previous cluster: %v", err) log.Fatalf("error tearing down previous cluster: %v", err)
} }