From 2509ccd7a90ed7e259935e9cc666021d87cd56e0 Mon Sep 17 00:00:00 2001 From: Thong Kuah Date: Thu, 13 Sep 2018 12:04:25 +1200 Subject: [PATCH] Auto devops should wait for Deployment to complete Vendors in Auto-DevOps.gitlab-ci.yml from https://gitlab.com/gitlab-org/gitlab-ci-yml/merge_requests/195 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/50186 --- .../vendor-auto-devops-gitlab-ci-fix-503-on-deploy.yml | 6 ++++++ vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml | 2 ++ 2 files changed, 8 insertions(+) create mode 100644 changelogs/unreleased/vendor-auto-devops-gitlab-ci-fix-503-on-deploy.yml diff --git a/changelogs/unreleased/vendor-auto-devops-gitlab-ci-fix-503-on-deploy.yml b/changelogs/unreleased/vendor-auto-devops-gitlab-ci-fix-503-on-deploy.yml new file mode 100644 index 00000000000..11ebf567e9d --- /dev/null +++ b/changelogs/unreleased/vendor-auto-devops-gitlab-ci-fix-503-on-deploy.yml @@ -0,0 +1,6 @@ +--- +title: Vendor Auto-DevOps.gitlab-ci.yml to fix bug where the deploy job does not wait + for Deployment to complete +merge_request: 21713 +author: +type: fixed diff --git a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml index 0b362fa0bee..27553a6b374 100644 --- a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml +++ b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml @@ -604,6 +604,8 @@ rollout 100%: --version="$CI_PIPELINE_ID-$CI_JOB_ID" \ "$name" \ chart/ + + kubectl rollout status -n "$KUBE_NAMESPACE" -w "deployment/$name" } function scale() {