From 486ddae35ae5f7484995d9139c205f4a8c7f9245 Mon Sep 17 00:00:00 2001 From: Random-Liu Date: Fri, 9 Dec 2016 10:45:04 -0800 Subject: [PATCH] `make test-e2e-node` runs the same test with pr builder by default. --- hack/make-rules/test-e2e-node.sh | 2 +- test/e2e_node/remote/remote.go | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hack/make-rules/test-e2e-node.sh b/hack/make-rules/test-e2e-node.sh index 9ab03575e24..a2d650d3bf7 100755 --- a/hack/make-rules/test-e2e-node.sh +++ b/hack/make-rules/test-e2e-node.sh @@ -18,7 +18,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../.. source "${KUBE_ROOT}/hack/lib/init.sh" focus=${FOCUS:-""} -skip=${SKIP:-""} +skip=${SKIP-"\[Flaky\]|\[Slow\]|\[Serial\]"} # The number of tests that can run in parallel depends on what tests # are running and on the size of the node. Too many, and tests will # fail due to resource contention. 8 is a reasonable default for a diff --git a/test/e2e_node/remote/remote.go b/test/e2e_node/remote/remote.go index 8f905416145..be02298dfdd 100644 --- a/test/e2e_node/remote/remote.go +++ b/test/e2e_node/remote/remote.go @@ -317,7 +317,11 @@ func getTestArtifacts(host, testDir string) error { // in the runner. This is used to collect serial console log. // TODO(random-liu): Use the log-dump script in cluster e2e. func WriteLog(host, filename, content string) error { - f, err := os.Create(filepath.Join(*resultsDir, host, filename)) + logPath := filepath.Join(*resultsDir, host) + if err := os.MkdirAll(logPath, 0755); err != nil { + return fmt.Errorf("failed to create log directory %q: %v", logPath, err) + } + f, err := os.Create(filepath.Join(logPath, filename)) if err != nil { return err }