summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2019-01-23 02:29:41 +0800
committerLin Jen-Shin <godfat@godfat.org>2019-01-23 02:29:41 +0800
commitf2d1aad2250ff856c08be164ebf1facb5f3f95e4 (patch)
tree0671b87aed909ee6ef6c0660364fa7a396a60077 /.gitlab-ci.yml
parentae2166188d11c6a0fef133af4b154ddf7fa83fd6 (diff)
downloadgitlab-ce-f2d1aad2250ff856c08be164ebf1facb5f3f95e4.tar.gz
All review jobs should share the same only & except
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml22
1 files changed, 13 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 383300a895f..bca16f50245 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -427,15 +427,7 @@ setup-test-env:
- vendor/gitaly-ruby
# GitLab Review apps
-.review-base: &review-base
- <<: *dedicated-no-docs-no-db-pull-cache-job
- image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-charts-build-base
- stage: test
- cache: {}
- dependencies: []
- environment: &review-environment
- name: review/${CI_COMMIT_REF_NAME}
- url: https://gitlab-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}
+.review-only: &review-only
only:
refs:
- branches@gitlab-org/gitlab-ce
@@ -445,6 +437,17 @@ setup-test-env:
refs:
- master
- /(^docs[\/-].*|.*-docs$)/
+
+.review-base: &review-base
+ <<: *dedicated-no-docs-no-db-pull-cache-job
+ <<: *review-only
+ image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-charts-build-base
+ stage: test
+ cache: {}
+ dependencies: []
+ environment: &review-environment
+ name: review/${CI_COMMIT_REF_NAME}
+ url: https://gitlab-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}
before_script: []
.review-docker: &review-docker
@@ -949,6 +952,7 @@ no_ee_check:
# GitLab Review apps
review-build-cng:
<<: *single-script-job
+ <<: *review-only
variables:
<<: *single-script-job-variables
SCRIPT_NAME: trigger-build