From 7e1d74ead2f74fdfc1e7fddbe45ede45ebe5b248 Mon Sep 17 00:00:00 2001 From: Yang Guo Date: Tue, 19 Dec 2017 20:50:09 -0800 Subject: [PATCH] node_e2e: do not return error if Docker's check-config.sh fails --- test/e2e_node/gke_environment_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/e2e_node/gke_environment_test.go b/test/e2e_node/gke_environment_test.go index 0b1c95c348e..dd88976b39c 100644 --- a/test/e2e_node/gke_environment_test.go +++ b/test/e2e_node/gke_environment_test.go @@ -139,10 +139,10 @@ func checkDockerConfig() error { if _, err := os.Stat(bin); os.IsNotExist(err) { continue } - output, err := runCommand(bin) - if err != nil { - return err - } + // We don't check the return code because it's OK if the script returns + // a non-zero exit code just because the configs in the whitelist are + // missing. + output, _ := runCommand(bin) for _, line := range strings.Split(output, "\n") { if !strings.Contains(line, "missing") { continue