Merge pull request #24426 from pwittrock/flaky

Automatic merge from submit-queue

Incremental improvements to kubelet e2e tests

- Add keep-alive to ssh connection
- Don't try to stop services on image-based runs
- Increase jenkins ci timeout to 90 minutes to accomadate unpredictable go build times
- Remove spammy log statement
This commit is contained in:
k8s-merge-robot
2016-04-19 22:36:40 -07:00
5 changed files with 9 additions and 10 deletions

View File

@@ -93,7 +93,7 @@
- ansicolor:
colormap: xterm
- timeout:
timeout: 45
timeout: 90
fail: true
- timestamps
- inject: