diff --git a/src/e2e-tests/failover_test.go b/src/e2e-tests/failover_test.go index 8dccae260..dcd271166 100644 --- a/src/e2e-tests/failover_test.go +++ b/src/e2e-tests/failover_test.go @@ -111,7 +111,8 @@ var _ = Describe("Failover", Ordered, Label("failover"), func() { When("the failed VM is restored", func() { BeforeAll(func() { - Expect(bosh.CloudCheck(deploymentName)).To(Succeed()) + _ = bosh.CloudCheck(deploymentName, "--resolution=recreate_vm") + Expect(bosh.CloudCheck(deploymentName, "--report")).To(Succeed()) }) It("observes the cluster eventually fully recovers", func() { diff --git a/src/e2e-tests/utilities/bosh/bosh.go b/src/e2e-tests/utilities/bosh/bosh.go index 528321764..d457bc77a 100644 --- a/src/e2e-tests/utilities/bosh/bosh.go +++ b/src/e2e-tests/utilities/bosh/bosh.go @@ -28,15 +28,14 @@ type Instance struct { ProcessState string `json:"process_state"` } -func CloudCheck(deploymentName string) error { - return cmd.Run( - "bosh", - "--deployment="+deploymentName, +func CloudCheck(deploymentName string, args ...string) error { + cloudCheckArgs := append([]string{ + "--deployment=" + deploymentName, "--non-interactive", "--tty", "cloud-check", - "--auto", - ) + }, args...) + return cmd.Run("bosh", cloudCheckArgs...) } func DeleteDeployment(deploymentName string) error {