summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2017-12-19 19:43:50 +0800
committerLin Jen-Shin <godfat@godfat.org>2017-12-19 19:43:50 +0800
commit73f615a5c6be79a6d464f25575d8ba3f1c98a0a2 (patch)
treec94cc7cfb273a8be905368e45ed17da0be4d91db /.gitlab-ci.yml
parent888ed3096946f3b7b93d621285ae4c2c6aeef9d0 (diff)
downloadgitlab-ce-73f615a5c6be79a6d464f25575d8ba3f1c98a0a2.tar.gz
Make sure two except won't overwrite each other
This is a pretty boring solution, but I can't think of a good idea right now and this might be good enough for now...
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml44
1 files changed, 18 insertions, 26 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2493250f8fb..c26e7f0aeba 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -80,10 +80,14 @@ stages:
except:
- /(^qa[\/-].*|.*-qa$)/
+.except-docs-and-qa: &except-docs-and-qa
+ except:
+ - /(^docs[\/-].*|.*-docs$)/
+ - /(^qa[\/-].*|.*-qa$)/
+
.rspec-metadata: &rspec-metadata
<<: *dedicated-runner
- <<: *except-docs
- <<: *except-qa
+ <<: *except-docs-and-qa
<<: *pull-cache
stage: test
script:
@@ -121,8 +125,7 @@ stages:
.spinach-metadata: &spinach-metadata
<<: *dedicated-runner
- <<: *except-docs
- <<: *except-qa
+ <<: *except-docs-and-qa
<<: *pull-cache
stage: test
script:
@@ -222,8 +225,7 @@ review-docs-cleanup:
# Retrieve knapsack and rspec_flaky reports
retrieve-tests-metadata:
<<: *tests-metadata-state
- <<: *except-docs
- <<: *except-qa
+ <<: *except-docs-and-qa
stage: prepare
cache:
key: tests_metadata
@@ -378,8 +380,7 @@ spinach-mysql 3 4: *spinach-metadata-mysql
.rake-exec: &rake-exec
<<: *dedicated-runner
- <<: *except-docs
- <<: *except-qa
+ <<: *except-docs-and-qa
<<: *pull-cache
<<: *ruby-static-analysis
stage: test
@@ -443,8 +444,7 @@ ee_compat_check:
# DB migration, rollback, and seed jobs
.db-migrate-reset: &db-migrate-reset
<<: *dedicated-runner
- <<: *except-docs
- <<: *except-qa
+ <<: *except-docs-and-qa
<<: *pull-cache
stage: test
script:
@@ -466,8 +466,7 @@ db:check-schema-pg:
.migration-paths: &migration-paths
<<: *dedicated-runner
- <<: *except-docs
- <<: *except-qa
+ <<: *except-docs-and-qa
<<: *pull-cache
stage: test
variables:
@@ -494,8 +493,7 @@ migration:path-mysql:
.db-rollback: &db-rollback
<<: *dedicated-runner
- <<: *except-docs
- <<: *except-qa
+ <<: *except-docs-and-qa
<<: *pull-cache
stage: test
script:
@@ -512,8 +510,7 @@ db:rollback-mysql:
.db-seed_fu: &db-seed_fu
<<: *dedicated-runner
- <<: *except-docs
- <<: *except-qa
+ <<: *except-docs-and-qa
<<: *pull-cache
stage: test
variables:
@@ -541,8 +538,7 @@ db:seed_fu-mysql:
# Frontend-related jobs
gitlab:assets:compile:
<<: *dedicated-runner
- <<: *except-docs
- <<: *except-qa
+ <<: *except-docs-and-qa
<<: *pull-cache
stage: test
dependencies: []
@@ -564,8 +560,7 @@ gitlab:assets:compile:
karma:
<<: *dedicated-runner
- <<: *except-docs
- <<: *except-qa
+ <<: *except-docs-and-qa
<<: *pull-cache
<<: *use-pg
stage: test
@@ -619,8 +614,7 @@ qa:internal:
coverage:
<<: *dedicated-runner
- <<: *except-docs
- <<: *except-qa
+ <<: *except-docs-and-qa
<<: *pull-cache
stage: post-test
services: []
@@ -639,8 +633,7 @@ coverage:
lint:javascript:report:
<<: *dedicated-runner
- <<: *except-docs
- <<: *except-qa
+ <<: *except-docs-and-qa
<<: *pull-cache
stage: post-test
dependencies:
@@ -699,8 +692,7 @@ cache gems:
gitlab_git_test:
<<: *dedicated-runner
- <<: *except-docs
- <<: *except-qa
+ <<: *except-docs-and-qa
<<: *pull-cache
variables:
SETUP_DB: "false"