node_e2e: disable serialized image pulls and increase test timeout

pull/6/head
Yu-Ju Hong 2016-04-21 15:34:28 -07:00
parent e73606b974
commit a29432163e
2 changed files with 2 additions and 1 deletions

View File

@ -145,6 +145,7 @@ func (es *e2eService) startKubeletServer() (*exec.Cmd, error) {
"--hostname-override", es.nodeName, // Required because hostname is inconsistent across hosts "--hostname-override", es.nodeName, // Required because hostname is inconsistent across hosts
"--volume-stats-agg-period", "10s", // Aggregate volumes frequently so tests don't need to wait as long "--volume-stats-agg-period", "10s", // Aggregate volumes frequently so tests don't need to wait as long
"--allow-privileged", "true", "--allow-privileged", "true",
"--serialize-image-pulls", "false",
) )
hcc := newHealthCheckCommand( hcc := newHealthCheckCommand(
"http://127.0.0.1:10255/healthz", "http://127.0.0.1:10255/healthz",

View File

@ -184,7 +184,7 @@ func newHostExecPodSpec(ns, name string) *api.Pod {
func waitForPodRunning(c *client.Client, ns string, name string) error { func waitForPodRunning(c *client.Client, ns string, name string) error {
var pod *api.Pod var pod *api.Pod
var err error var err error
for t := time.Now(); time.Since(t) < time.Minute; time.Sleep(time.Second * 5) { for t := time.Now(); time.Since(t) < time.Minute*2; time.Sleep(time.Second * 5) {
pod, err = c.Pods(ns).Get(name) pod, err = c.Pods(ns).Get(name)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
if pod == nil { if pod == nil {