e2e: fix tests that are broken because of the image prepull pod

Many tests expect all kube-system pods to be running and ready. The newly
added image prepull add-on pod can in the "succeeded" state. This commit fixes
the tests to allow kube-system pods to be succeeded.
This commit is contained in:
Yu-Ju Hong
2016-05-25 09:29:50 -07:00
parent 025b017277
commit cd82c543b9
5 changed files with 36 additions and 14 deletions

View File

@@ -396,7 +396,7 @@ var _ = framework.KubeDescribe("Nodes [Disruptive]", func() {
// the cluster is restored to health.
By("waiting for system pods to successfully restart")
err := framework.WaitForPodsRunningReady(api.NamespaceSystem, systemPodsNo, framework.PodReadyBeforeTimeout, map[string]string{})
err := framework.WaitForPodsRunningReady(api.NamespaceSystem, systemPodsNo, framework.PodReadyBeforeTimeout, framework.ImagePullerLabels)
Expect(err).NotTo(HaveOccurred())
})