diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-15 06:06:19 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-15 06:06:19 +0300 |
| commit | 94be244a9fb5da7a8b5d5fb99e5760cde17715ac (patch) | |
| tree | e0596a229e107500553b20a0032b6ca36333d270 /lib/gitlab/kubernetes | |
| parent | 1dc3ec7f98798e85d8495e37691477d344c9ad5b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/kubernetes')
| -rw-r--r-- | lib/gitlab/kubernetes/helm/client_command.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/kubernetes/helm/client_command.rb b/lib/gitlab/kubernetes/helm/client_command.rb index 05cf5d2f881..a3f732e1283 100644 --- a/lib/gitlab/kubernetes/helm/client_command.rb +++ b/lib/gitlab/kubernetes/helm/client_command.rb @@ -17,7 +17,8 @@ module Gitlab # This is necessary to give Tiller time to restart after upgrade. # Ideally we'd be able to use --wait but cannot because of # https://github.com/helm/helm/issues/4855 - "for i in $(seq 1 30); do #{helm_check} && break; sleep 1s; echo \"Retrying ($i)...\"; false; done" + + "for i in $(seq 1 30); do #{helm_check} && s=0 && break || s=$?; sleep 1s; echo \"Retrying ($i)...\"; done; (exit $s)" end def repository_command |