github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #34442 from wojtek-t/fix_failed_runs 

Automatic merge from submit-queue

Try to bring down cluster in case of failure

Should help with #33867

This is reenabling feature that @ixdy described here:
https://github.com/kubernetes/kubernetes/issues/33867#issuecomment-251533299

@kubernetes/test-infra-maintainers
pull/6/head
Kubernetes Submit Queue 2016-10-12 04:31:21 -07:00 committed by GitHub
parent 4d882744d6 1cfbb446c8
commit ea5afb9ab7
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hack/e2e.go
View File

@ -223,6 +223,15 @@ func run(deploy deployer) error {
}
if *up {
// If we tried to bring the cluster up, make a courtesy
// attempt to bring it down so we're not leaving resources around.
//
// TODO: We should try calling deploy.Down exactly once. Though to
// stop the leaking resources for now, we want to be on the safe side
// and call it explictly in defer if the other one is not called.
if *down {
defer xmlWrap("Deferred TearDown", deploy.Down)
}
// Start the cluster using this version.
if err := xmlWrap("Up", deploy.Up); err != nil {
return fmt.Errorf("starting e2e cluster: %s", err)
@ -579,6 +588,15 @@ func KubemarkTest() error {
if err != nil {
return err
}
// If we tried to bring the Kubemark cluster up, make a courtesy
// attempt to bring it down so we're not leaving resources around.
//
// TODO: We should try calling stop-kubemark exactly once. Though to
// stop the leaking resources for now, we want to be on the safe side
// and call it explictly in defer if the other one is not called.
defer xmlWrap("Deferred Stop kubemark", func() error {
return finishRunning("Stop kubemark", exec.Command("./test/kubemark/stop-kubemark.sh"))
})
// Start new run
backups := []string{"NUM_NODES", "MASTER_SIZE"}
@ -592,7 +610,9 @@ func KubemarkTest() error {
}
os.Setenv("NUM_NODES", os.Getenv("KUBEMARK_NUM_NODES"))
os.Setenv("MASTER_SIZE", os.Getenv("KUBEMARK_MASTER_SIZE"))
err = finishRunning("Start Kubemark", exec.Command("./test/kubemark/start-kubemark.sh"))
err = xmlWrap("Start kubemark", func() error {
return finishRunning("Start kubemark", exec.Command("./test/kubemark/start-kubemark.sh"))
})
if err != nil {
return err
}
@ -609,7 +629,9 @@ func KubemarkTest() error {
return err
}
err = finishRunning("Stop kubemark", exec.Command("./test/kubemark/stop-kubemark.sh"))
err = xmlWrap("Stop kubemark", func() error {
return finishRunning("Stop kubemark", exec.Command("./test/kubemark/stop-kubemark.sh"))
})
if err != nil {
return err
}