diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-01-23 07:59:12 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-01-23 07:59:12 +0000 |
| commit | e67af0698970beb7f12ae0945870a5b217f8d45d (patch) | |
| tree | bae40d36eeaf9e2d150c9ad1759aed2053732111 | |
| parent | 3b10de4b5146d9f7d96194cfc70d3c9be2d53055 (diff) | |
| parent | f2d1aad2250ff856c08be164ebf1facb5f3f95e4 (diff) | |
| download | gitlab-ce-e67af0698970beb7f12ae0945870a5b217f8d45d.tar.gz | |
Merge branch 'fix-review-build-cng-condition' into 'master'
All review jobs should share the same only & except
Closes #56707
See merge request gitlab-org/gitlab-ce!24579
| -rw-r--r-- | .gitlab-ci.yml | 22 |
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 |