Commit 7153981b authored by Tim St. Clair's avatar Tim St. Clair

Fix node e2e image pulling retry logic

parent 9dc06e85
...@@ -63,11 +63,15 @@ func PrePullAllImages() error { ...@@ -63,11 +63,15 @@ func PrePullAllImages() error {
err error err error
output []byte output []byte
) )
for i := maxImagePullRetries; i > 0; i++ { for i := 0; i < maxImagePullRetries; i++ {
if i > 0 {
time.Sleep(imagePullRetryDelay)
}
if output, err = exec.Command("docker", "pull", image).CombinedOutput(); err == nil { if output, err = exec.Command("docker", "pull", image).CombinedOutput(); err == nil {
break break
} }
time.Sleep(imagePullRetryDelay) glog.Warningf("Failed to pull %s, retrying in %s (%d of %d): %v",
image, imagePullRetryDelay.String(), i+1, maxImagePullRetries, err)
} }
if err != nil { if err != nil {
glog.Warningf("Could not pre-pull image %s %v output: %s", image, err, output) glog.Warningf("Could not pre-pull image %s %v output: %s", image, err, output)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment