From 2ad5f014a12f6b2a34e8ddc71e3020e9298444a5 Mon Sep 17 00:00:00 2001 From: Harshal Patil Date: Mon, 14 Sep 2020 11:46:36 +0530 Subject: [PATCH] Add a check for crio service before starting node e2e tests Signed-off-by: Harshal Patil --- test/e2e_node/runner/remote/run_remote.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test/e2e_node/runner/remote/run_remote.go b/test/e2e_node/runner/remote/run_remote.go index cbaa9710b2a..b1fdc5f9b00 100644 --- a/test/e2e_node/runner/remote/run_remote.go +++ b/test/e2e_node/runner/remote/run_remote.go @@ -668,14 +668,15 @@ 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'") + "'systemctl list-units --type=service --state=running | grep -e docker -e containerd -e crio'") if err != nil { - err = fmt.Errorf("instance %s not running docker/containerd daemon - Command failed: %s", name, output) + err = fmt.Errorf("instance %s not running docker/containerd/crio daemon - Command failed: %s", name, output) continue } if !strings.Contains(output, "docker.service") && - !strings.Contains(output, "containerd.service") { - err = fmt.Errorf("instance %s not running docker/containerd daemon: %s", name, output) + !strings.Contains(output, "containerd.service") && + !strings.Contains(output, "crio.service") { + err = fmt.Errorf("instance %s not running docker/containerd/crio daemon: %s", name, output) continue } instanceRunning = true