summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2018-09-13 11:10:05 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2018-09-13 11:10:05 +0000
commit38707042fc7da06cae8e4f8dfa0650ab8d924062 (patch)
tree11294ab48b2f0b94d4e2d203610b966e3b5d87da
parentbfe0b0fed0d1bfa48ac61781361369a4946684b8 (diff)
parent2509ccd7a90ed7e259935e9cc666021d87cd56e0 (diff)
downloadgitlab-ce-38707042fc7da06cae8e4f8dfa0650ab8d924062.tar.gz
Merge branch 'vendor-auto-devops-gitlab-ci-fix-503-on-deploy' into 'master'
Vendor Auto-DevOps.gitlab-ci.yml: fix where the deploy job does not wait for Deployment to complete. Closes #50186 and charts/auto-deploy-app#6 See merge request gitlab-org/gitlab-ce!21713
-rw-r--r--changelogs/unreleased/vendor-auto-devops-gitlab-ci-fix-503-on-deploy.yml6
-rw-r--r--vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml2
2 files changed, 8 insertions, 0 deletions
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 1c488b040f2..a191f1f59bf 100644
--- a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml
+++ b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml
@@ -608,6 +608,8 @@ rollout 100%:
--version="$CI_PIPELINE_ID-$CI_JOB_ID" \
"$name" \
chart/
+
+ kubectl rollout status -n "$KUBE_NAMESPACE" -w "deployment/$name"
}
function scale() {