mirror of https://github.com/k3s-io/k3s
Merge pull request #32420 from ixdy/e2e-teardown-on-up
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 @davidopppull/6/head
commit
57604d13cd
|
@ -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)
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue