Merge pull request #23736 from pwittrock/flaky

test/e2e_node/conformance_test.go

@@ -28,8 +28,10 @@ import (
 )
 
 const (
-	retryTimeout = 4 * time.Minute
-	pollInterval = time.Second * 5
+	retryTimeout      = time.Minute * 4
+	pollInterval      = time.Second * 5
+	imageRetryTimeout = time.Minute * 2
+	imagePullInterval = time.Second * 15
 )
 
 var _ = Describe("Container Conformance Test", func() {
@@ -55,10 +57,10 @@ var _ = Describe("Container Conformance Test", func() {
 					conformImages = append(conformImages, image)
 				}
 				for _, image := range conformImages {
-					if err := image.Pull(); err != nil {
-						Expect(err).NotTo(HaveOccurred())
-						break
-					}
+					// Pulling images from gcr.io is flaky, so retry failures
+					Eventually(func() error {
+						return image.Pull()
+					}, imageRetryTimeout, imagePullInterval).ShouldNot(HaveOccurred())
 				}
 			})
 			It("it should list pulled images [Conformance]", func() {

test/e2e_node/e2e_service.go

@@ -155,7 +155,7 @@ func (es *e2eService) startServer(cmd *healthCheckCommand) error {
 	go func() {
 		err := cmd.Run()
 		if err != nil {
-			cmdErrorChan <- fmt.Errorf("%s Exited with status %v.  Output:\n%v", cmd, err, *cmd.OutputBuffer)
+			cmdErrorChan <- fmt.Errorf("%s Exited with status %v.  Output:\n%s", cmd, err, *cmd.OutputBuffer)
 		}
 		close(cmdErrorChan)
 	}()