summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2019-09-11 16:57:03 +0000
committerRémy Coutable <remy@rymai.me>2019-09-11 16:57:03 +0000
commit6db9cbfe77a556ea2d321f0ea0a0c6b6e14a817c (patch)
treed7de6de826361252b166c946e0374d529b2a039a
parentfb72c5db14bccdd127f56894b2aa65886423c53e (diff)
parentd2507c6dc2bcf5ead9a69c8f723df185f99852f3 (diff)
downloadgitlab-ce-6db9cbfe77a556ea2d321f0ea0a0c6b6e14a817c.tar.gz
Merge branch '26893-ee-fix-scheduled-review-app-needs' into 'master'
Fix review pipeline needs blocking scheduled deploys Closes #26893 and gitlab-ee#26893 See merge request gitlab-org/gitlab-ce!32925
-rw-r--r--.gitlab/ci/review.gitlab-ci.yml11
1 files changed, 8 insertions, 3 deletions
diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml
index 69af12b5108..5db194e06f7 100644
--- a/.gitlab/ci/review.gitlab-ci.yml
+++ b/.gitlab/ci/review.gitlab-ci.yml
@@ -74,11 +74,10 @@ schedule:review-build-cng:
- .review-schedules-only
needs: ["gitlab:assets:compile"]
-review-deploy:
+.review-deploy-base:
extends: .review-base
allow_failure: true
stage: review
- needs: ["review-build-cng"]
variables:
HOST_SUFFIX: "${CI_ENVIRONMENT_SLUG}"
DOMAIN: "-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}"
@@ -108,10 +107,16 @@ review-deploy:
expire_in: 2 days
when: always
+review-deploy:
+ extends:
+ - .review-deploy-base
+ needs: ["review-build-cng"]
+
schedule:review-deploy:
extends:
- - review-deploy
+ - .review-deploy-base
- .review-schedules-only
+ needs: ["schedule:review-build-cng"]
review-stop:
extends: review-deploy