Merge pull request #36119 from rmmh/godep-restore

Automatic merge from submit-queue Retry "godep restore" once in verify-dockerized.sh This should fix #36110. The current flake rate is 0.5%, so with the unrealistic assumption of uncorrelated flakes, a single retry will bring it down to <0.01% flake rate.

Merge pull request #36119 from rmmh/godep-restore
5bca864d · Kubernetes Submit Queue · GitHub · d34c02f1 · bfae6740 · 5bca864d
Commit 5bca864d authored Nov 03, 2016 by Kubernetes Submit Queue Committed by GitHub Nov 03, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

verify-dockerized.sh hack/jenkins/verify-dockerized.sh +2 -1

No files found.
--- a/hack/jenkins/verify-dockerized.sh
+++ b/hack/jenkins/verify-dockerized.sh
@@ -39,7 +39,8 @@ export LOG_LEVEL=4
 cd /go/src/k8s.io/kubernetes

 # hack/verify-client-go.sh requires all dependencies exist in the GOPATH.
-godep restore
+# the retry helps avoid flakes while keeping total time bounded.
+godep restore || godep restore

 ./hack/install-etcd.sh
 make verify