summaryrefslogtreecommitdiff
path: root/.gitlab
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2019-06-05 17:23:12 +0000
committerRémy Coutable <remy@rymai.me>2019-06-05 17:23:12 +0000
commitdbcbfc2638c289307c6e421fa6a5ca48603b1d53 (patch)
treeb153ca69d210308a68b6265cef689d1538e46f18 /.gitlab
parentd308cfb7a184cba05ef6bb9d1befd2ed51d3b4b1 (diff)
parent8cf2a57bc90f8ab3a8fbf576cc6d98f7e0822034 (diff)
downloadgitlab-ce-dbcbfc2638c289307c6e421fa6a5ca48603b1d53.tar.gz
Merge branch 'qa-allow-review-jobs-to-fail' into 'master'
Allow the review-deploy and review-qa-* jobs to fail for now See merge request gitlab-org/gitlab-ce!29208
Diffstat (limited to '.gitlab')
-rw-r--r--.gitlab/ci/review.gitlab-ci.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml
index f5ed3e1ad9a..9b764028be9 100644
--- a/.gitlab/ci/review.gitlab-ci.yml
+++ b/.gitlab/ci/review.gitlab-ci.yml
@@ -76,8 +76,8 @@ schedule:review-build-cng:
.review-deploy-base: &review-deploy-base
<<: *review-base
+ allow_failure: true
stage: review
- retry: 2
variables:
HOST_SUFFIX: "${CI_ENVIRONMENT_SLUG}"
DOMAIN: "-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}"
@@ -128,6 +128,7 @@ review-stop:
.review-qa-base: &review-qa-base
<<: *review-docker
+ allow_failure: true
stage: qa
variables:
<<: *review-docker-variables
@@ -157,7 +158,6 @@ review-stop:
review-qa-smoke:
<<: *review-qa-base
- retry: 2
script:
- gitlab-qa Test::Instance::Smoke "${QA_IMAGE}" "${CI_ENVIRONMENT_URL}"