Skip to content

K
k3s
Commit 7e1d74ea authored by Yang Guo's avatar Yang Guo
Browse files
Options

node_e2e: do not return error if Docker's check-config.sh fails

parent f3024879
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
test/e2e_node/gke_environment_test.go
View file @ 7e1d74ea
...@@ -139,10 +139,10 @@ func checkDockerConfig() error { ...@@ -139,10 +139,10 @@ func checkDockerConfig() error {
if _, err := os.Stat(bin); os.IsNotExist(err) { if _, err := os.Stat(bin); os.IsNotExist(err) {
continue continue
} }
output, err := runCommand(bin) // We don't check the return code because it's OK if the script returns
if err != nil { // a non-zero exit code just because the configs in the whitelist are
return err // missing.
} output, _ := runCommand(bin)
for _, line := range strings.Split(output, "\n") { for _, line := range strings.Split(output, "\n") {
if !strings.Contains(line, "missing") { if !strings.Contains(line, "missing") {
continue continue
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment