From 0e0e3113e2f6acdc7ffd8aee1f55e03b7e4ed13a Mon Sep 17 00:00:00 2001 From: Danielle Lancashire Date: Wed, 20 Apr 2022 16:49:29 +0000 Subject: [PATCH] e2e_node: remote runner: Require containerd/crio --- test/e2e_node/runner/remote/run_remote.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/test/e2e_node/runner/remote/run_remote.go b/test/e2e_node/runner/remote/run_remote.go index 1b52e780765..c82923b5b32 100644 --- a/test/e2e_node/runner/remote/run_remote.go +++ b/test/e2e_node/runner/remote/run_remote.go @@ -705,15 +705,14 @@ func createInstance(imageConfig *internalGCEImage) (string, error) { var output string output, err = remote.SSH(name, "sh", "-c", - "'systemctl list-units --type=service --state=running | grep -e docker -e containerd -e crio'") + "'systemctl list-units --type=service --state=running | grep -e containerd -e crio'") if err != nil { - err = fmt.Errorf("instance %s not running docker/containerd/crio daemon - Command failed: %s", name, output) + err = fmt.Errorf("instance %s not running containerd/crio daemon - Command failed: %s", name, output) continue } - if !strings.Contains(output, "docker.service") && - !strings.Contains(output, "containerd.service") && + if !strings.Contains(output, "containerd.service") && !strings.Contains(output, "crio.service") { - err = fmt.Errorf("instance %s not running docker/containerd/crio daemon: %s", name, output) + err = fmt.Errorf("instance %s not running containerd/crio daemon: %s", name, output) continue } instanceRunning = true