github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #94760 from harche/crio_tests_fix

Browse Source 
Add a check for crio service before starting node e2e tests
This commit is contained in:
Kubernetes Prow Robot 2020-09-21 08:56:31 -07:00 committed by GitHub
commit cdc7a2949b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/e2e_node/runner/remote/run_remote.go
View File

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