From d2507c6dc2bcf5ead9a69c8f723df185f99852f3 Mon Sep 17 00:00:00 2001 From: Kyle Wiebers Date: Wed, 11 Sep 2019 10:15:20 -0500 Subject: [PATCH] Fix review pipeline needs blocking scheduled deploys --- .gitlab/ci/review.gitlab-ci.yml | 11 ++++++++--- 1 file 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