Merge pull request kubernetes#94760 from harche/crio_tests_fix

Add a check for crio service before starting node e2e tests
bvsvas · Sep 21, 2020 · cdc7a29 · cdc7a29
2 parents 2d8fbd6 + 2ad5f01
commit cdc7a29
Showing 1 changed file with 5 additions and 4 deletions.
diff --git 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