Merge pull request #17683 from pwittrock/node_e2e_tests

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-12-09 12:50:22 -08:00
6 changed files with 100 additions and 33 deletions

View File

@@ -98,7 +98,7 @@ func main() {
// Wait for the tests to finish
w.Wait()
glog.Infof("All hosts finished")
glog.Infof("Done")
}
func WaitForUser() {
@@ -150,7 +150,8 @@ func runTests(host string) ([]byte, error) {
ginkoTests := filepath.Join(kubeRoot, ginkoTestRelPath)
return exec.Command(
"ginkgo", ginkoTests, "--",
"--kubelet-host", "localhost", "--kubelet-port", kh.LPort,
"--api-server-host", "localhost", "--api-server-port", kh.LPort,
"--kubelet-address", fmt.Sprintf("http://localhost:%s", kh.LPort),
"--api-server-address", fmt.Sprintf("http://localhost:%s", ah.LPort),
"--node-name", host,
"-logtostderr").CombinedOutput()
}