summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-05-29 07:12:44 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-05-29 07:12:44 +0000
commit6a4f265c940d3d0a9aeacf09222920d7d2cc4e45 (patch)
tree4cf73897e78f8fee50e39edb7d74fa628b6a87da /lib
parentcba453953c1598f83b2ed72bc012b65e0df5b767 (diff)
downloadgitlab-ce-6a4f265c940d3d0a9aeacf09222920d7d2cc4e45.tar.gz
Add latest changes from gitlab-org/gitlab@13-0-stable-ee
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
index b4e5a41a34d..3fbae496896 100644
--- a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
@@ -86,6 +86,7 @@ staging:
canary:
extends: .auto-deploy
stage: canary
+ allow_failure: true
script:
- auto-deploy check_kube_domain
- auto-deploy download_chart
@@ -176,6 +177,7 @@ production_manual:
.manual_rollout_template: &manual_rollout_template
<<: *rollout_template
stage: production
+ allow_failure: true
rules:
- if: '$CI_KUBERNETES_ACTIVE == null || $CI_KUBERNETES_ACTIVE == ""'
when: never