Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Check for either docker or containerd getting active #92204

Merged
merged 2 commits into from Jun 18, 2020
Merged

Check for either docker or containerd getting active #92204

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbb4bb0
Set better default commands for loading images
dims Jun 16, 2020
01183e5
Check for either Docker or Containerd getting active for e2e_node tests
dims Jun 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 6 additions & 4 deletions test/e2e_node/runner/remote/run_remote.go
View file
Open in desktop
Expand Up @@ -668,13 +668,15 @@ func createInstance(imageConfig *internalGCEImage) (string, error) {
// TODO(random-liu): Remove the docker version check. Use some other command to check
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does this TODO become obsolete with this check?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#92274

// instance readiness.
var output string
output, err = remote.SSH(name, "docker", "version")
output, err = remote.SSH(name, "sh", "-c",
"'systemctl list-units --type=service --state=running | grep -e docker -e containerd'")
if err != nil {
err = fmt.Errorf("instance %s not running docker daemon - Command failed: %s", name, output)
err = fmt.Errorf("instance %s not running docker/containerd daemon - Command failed: %s", name, output)
continue
}
if !strings.Contains(output, "Server") {
err = fmt.Errorf("instance %s not running docker daemon - Server not found: %s", name, output)
if !strings.Contains(output, "docker.service") &&
!strings.Contains(output, "containerd.service") {
err = fmt.Errorf("instance %s not running docker/containerd daemon: %s", name, output)
continue
}
instanceRunning = true
Expand Down