diff --git a/test/integration/addons_test.go b/test/integration/addons_test.go index e727c1232b86..3e2ca45f2173 100644 --- a/test/integration/addons_test.go +++ b/test/integration/addons_test.go @@ -220,7 +220,6 @@ func testGvisor(t *testing.T) { func testGvisorRestart(t *testing.T) { minikubeRunner := NewMinikubeRunner(t) minikubeRunner.EnsureRunning() - fmt.Println("enabling gvisor") minikubeRunner.RunCommand("addons enable gvisor", true) t.Log("waiting for gvisor controller to come up") @@ -228,8 +227,16 @@ func testGvisorRestart(t *testing.T) { t.Fatalf("waiting for gvisor controller to be up: %v", err) } - minikubeRunner.RunCommand("delete", false) - minikubeRunner.CheckStatus(state.None.String()) + checkStop := func() error { + minikubeRunner.RunCommand("stop", true) + return minikubeRunner.CheckStatusNoFail(state.Stopped.String()) + } + + fmt.Println("trying to stop") + if err := util.Retry(t, checkStop, 5*time.Second, 6); err != nil { + t.Fatalf("timed out while checking stopped status: %v", err) + } + minikubeRunner.Start() minikubeRunner.CheckStatus(state.Running.String()) diff --git a/test/integration/util/util.go b/test/integration/util/util.go index 5faf473c89bc..a4b4a8d5b19b 100644 --- a/test/integration/util/util.go +++ b/test/integration/util/util.go @@ -126,8 +126,7 @@ func (m *MinikubeRunner) SSH(command string) (string, error) { func (m *MinikubeRunner) Start() { switch r := m.Runtime; r { case constants.ContainerdRuntime: - // TODO: priyawadhwa@ remove iso url once updated iso is being used in integration tests - containerdFlags := "--container-runtime=containerd --network-plugin=cni --docker-opt containerd=/var/run/containerd/containerd.sock --iso-url=https://storage.googleapis.com/k8s-minikube/gvisor-preview.iso" + containerdFlags := "--container-runtime=containerd --network-plugin=cni --docker-opt containerd=/var/run/containerd/containerd.sock" m.RunCommand(fmt.Sprintf("start %s %s %s", m.StartArgs, m.Args, containerdFlags), true) default: m.RunCommand(fmt.Sprintf("start %s %s", m.StartArgs, m.Args), true)