Commit 6db9cbfe authored by Rémy Coutable's avatar Rémy Coutable

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
parents fb72c5db d2507c6d
...@@ -74,11 +74,10 @@ schedule:review-build-cng: ...@@ -74,11 +74,10 @@ schedule:review-build-cng:
- .review-schedules-only - .review-schedules-only
needs: ["gitlab:assets:compile"] needs: ["gitlab:assets:compile"]
review-deploy: .review-deploy-base:
extends: .review-base extends: .review-base
allow_failure: true allow_failure: true
stage: review stage: review
needs: ["review-build-cng"]
variables: variables:
HOST_SUFFIX: "${CI_ENVIRONMENT_SLUG}" HOST_SUFFIX: "${CI_ENVIRONMENT_SLUG}"
DOMAIN: "-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}" DOMAIN: "-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}"
...@@ -108,10 +107,16 @@ review-deploy: ...@@ -108,10 +107,16 @@ review-deploy:
expire_in: 2 days expire_in: 2 days
when: always when: always
review-deploy:
extends:
- .review-deploy-base
needs: ["review-build-cng"]
schedule:review-deploy: schedule:review-deploy:
extends: extends:
- review-deploy - .review-deploy-base
- .review-schedules-only - .review-schedules-only
needs: ["schedule:review-build-cng"]
review-stop: review-stop:
extends: review-deploy extends: review-deploy
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment