mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 20:24:09 +00:00
Merge pull request #94760 from harche/crio_tests_fix
Add a check for crio service before starting node e2e tests
This commit is contained in:
commit
cdc7a2949b
@ -668,14 +668,15 @@ func createInstance(imageConfig *internalGCEImage) (string, error) {
|
|||||||
|
|
||||||
var output string
|
var output string
|
||||||
output, err = remote.SSH(name, "sh", "-c",
|
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 {
|
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
|
continue
|
||||||
}
|
}
|
||||||
if !strings.Contains(output, "docker.service") &&
|
if !strings.Contains(output, "docker.service") &&
|
||||||
!strings.Contains(output, "containerd.service") {
|
!strings.Contains(output, "containerd.service") &&
|
||||||
err = fmt.Errorf("instance %s not running docker/containerd daemon: %s", name, output)
|
!strings.Contains(output, "crio.service") {
|
||||||
|
err = fmt.Errorf("instance %s not running docker/containerd/crio daemon: %s", name, output)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
instanceRunning = true
|
instanceRunning = true
|
||||||
|
Loading…
Reference in New Issue
Block a user