github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 04:06:03 +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 (
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() {

2
test/e2e_node/e2e_service.go
View File

@ -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)
}()