From fa919cea52708beef143954c9e741c59c7d13dc9 Mon Sep 17 00:00:00 2001 From: Sergej Date: Mon, 6 May 2019 13:09:07 +0000 Subject: Auto-DevOps: allow to disable rollout status check --- changelogs/unreleased/kinolaev-master-patch-13154.yml | 5 +++++ lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 changelogs/unreleased/kinolaev-master-patch-13154.yml 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 +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() { -- cgit v1.2.1