Merge pull request kubernetes#22383 from spxtr/core

Auto commit by PR queue bot
lavalamp · Mar 8, 2016 · 7e9256b · 7e9256b
2 parents 999e631 + 44ef122
commit 7e9256b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 156 deletions.
diff --git a/test/e2e/core.go b/test/e2e/core.go
diff --git a/test/e2e/util.go b/test/e2e/util.go
@@ -29,6 +29,7 @@ import (
 	"net/url"
 	"os"
 	"os/exec"
+	"path"
 	"path/filepath"
 	"sort"
 	"strconv"
@@ -3559,3 +3560,14 @@ func CheckConnectivityToHost(f *Framework, nodeName, podName, host string) error
 	defer podClient.Delete(podName, nil)
 	return waitForPodSuccessInNamespace(f.Client, podName, contName, f.Namespace.Name)
 }
+
+// CoreDump SSHs to the master and all nodes and dumps their logs into dir.
+// It shells out to cluster/log-dump.sh to accomplish this.
+func CoreDump(dir string) {
+	cmd := exec.Command(path.Join(testContext.RepoRoot, "cluster", "log-dump.sh"), dir)
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	if err := cmd.Run(); err != nil {
+		Logf("Error running cluster/log-dump.sh: %v", err)
+	}
+}