diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-05-20 10:27:59 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-05-20 10:27:59 +0000 |
| commit | 0c1cd36afbc27c577f0d04771827518e84a6739d (patch) | |
| tree | 7405857d5ce9d28e16698e221c228e0085b92aef /lib | |
| parent | 801309308e677e724c772fddb1b99b0012453395 (diff) | |
| parent | cd68c560c2a3ed281dd0a8c1f84a81a77dc7056e (diff) | |
| download | gitlab-ce-0c1cd36afbc27c577f0d04771827518e84a6739d.tar.gz | |
Merge branch 'kinolaev-master-patch-13154' into 'master'
Auto-DevOps: allow to disable rollout status check
See merge request gitlab-org/gitlab-ce!28130
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml index 876f53c66ba..5f7af2ffc20 100644 --- a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml @@ -439,7 +439,9 @@ rollout 100%: chart/ fi - kubectl rollout status -n "$KUBE_NAMESPACE" -w "$ROLLOUT_RESOURCE_TYPE/$name" + if [[ -z "$ROLLOUT_STATUS_DISABLED" ]]; then + kubectl rollout status -n "$KUBE_NAMESPACE" -w "$ROLLOUT_RESOURCE_TYPE/$name" + fi } function scale() { |