diff options
| author | Sergej <kinolaev@gmail.com> | 2019-05-06 13:09:07 +0000 |
|---|---|---|
| committer | Sergej Nikolaev <kinolaev@gmail.com> | 2019-05-15 18:08:12 +0300 |
| commit | fa919cea52708beef143954c9e741c59c7d13dc9 (patch) | |
| tree | 4a1d15feafa1dab7de609f648ca83b235f506065 | |
| parent | 4d2d812463256003ab943df90a9c603821078a69 (diff) | |
| download | gitlab-ce-kinolaev/gitlab-ce-kinolaev-master-patch-13154.tar.gz | |
Auto-DevOps: allow to disable rollout status checkkinolaev/gitlab-ce-kinolaev-master-patch-13154
| -rw-r--r-- | changelogs/unreleased/kinolaev-master-patch-13154.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/changelogs/unreleased/kinolaev-master-patch-13154.yml b/changelogs/unreleased/kinolaev-master-patch-13154.yml new file mode 100644 index 00000000000..3292ff797e2 --- /dev/null +++ b/changelogs/unreleased/kinolaev-master-patch-13154.yml @@ -0,0 +1,5 @@ +--- +title: 'Auto-DevOps: allow to disable rollout status check' +merge_request: 28130 +author: Sergej Nikolaev <kinolaev@gmail.com> +type: fixed diff --git a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml index 9d99d04d263..3ce70c2e771 100644 --- a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml @@ -440,7 +440,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() { |