summaryrefslogtreecommitdiff
path: root/.gitlab/ci
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-17 15:09:01 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-17 15:09:01 +0000
commitb304a72312465ed4c0a568ee6a6ea5e97f705c9b (patch)
treea2f25dbea26c81e88b169c55a6275e3969323e82 /.gitlab/ci
parentb84eeb256c4a780d902faee1f99ca9a711b3214a (diff)
downloadgitlab-ce-b304a72312465ed4c0a568ee6a6ea5e97f705c9b.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab/ci')
-rw-r--r--.gitlab/ci/review.gitlab-ci.yml5
1 files changed, 4 insertions, 1 deletions
diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml
index 682ed12e199..c15c7c2ab5d 100644
--- a/.gitlab/ci/review.gitlab-ci.yml
+++ b/.gitlab/ci/review.gitlab-ci.yml
@@ -126,7 +126,6 @@ review-build-cng:
- .default-tags
- .default-retry
image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-charts-build-base
- dependencies: []
variables:
HOST_SUFFIX: "${CI_ENVIRONMENT_SLUG}"
DOMAIN: "-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}"
@@ -142,6 +141,9 @@ review-deploy:
- .review-workflow-base
- .review:rules:mr-and-schedule
stage: review
+ needs:
+ - job: review-build-cng
+ artifacts: false
allow_failure: true
before_script:
- '[[ ! -d "ee/" ]] || export GITLAB_EDITION="ee"'
@@ -169,6 +171,7 @@ review-deploy:
extends: .review-workflow-base
environment:
action: stop
+ dependencies: []
variables:
# We're cloning the repo instead of downloading the script for now
# because some repos are private and CI_JOB_TOKEN cannot access files.