github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #23736 from pwittrock/flaky

Browse Source 
Automatic merge from submit-queue

node e2e retry gcr.io failures
This commit is contained in:
k8s-merge-robot 2016-04-01 14:13:05 -07:00
commit d0155982aa
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/e2e_node/conformance_test.go
View File

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

2
test/e2e_node/e2e_service.go
View File

@ -155,7 +155,7 @@ func (es *e2eService) startServer(cmd *healthCheckCommand) error {
go func() { go func() {
err := cmd.Run() err := cmd.Run()
if err != nil { 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) close(cmdErrorChan)
}() }()