Merge pull request #109572 from endocrimes/dani/remote-docker

e2e_node: remote runner: Require containerd/crio
This commit is contained in:
Kubernetes Prow Robot 2022-05-04 02:34:03 -07:00 committed by GitHub
commit 1347e560ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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