Commit 7ed3759e authored by Grzegorz Bizon's avatar Grzegorz Bizon

Merge branch 'except-qa-and-docs' into 'master'

Make sure two except won't overwrite each other

See merge request gitlab-org/gitlab-ce!16010
parents 888ed309 73f615a5
...@@ -80,10 +80,14 @@ stages: ...@@ -80,10 +80,14 @@ stages:
except: except:
- /(^qa[\/-].*|.*-qa$)/ - /(^qa[\/-].*|.*-qa$)/
.except-docs-and-qa: &except-docs-and-qa
except:
- /(^docs[\/-].*|.*-docs$)/
- /(^qa[\/-].*|.*-qa$)/
.rspec-metadata: &rspec-metadata .rspec-metadata: &rspec-metadata
<<: *dedicated-runner <<: *dedicated-runner
<<: *except-docs <<: *except-docs-and-qa
<<: *except-qa
<<: *pull-cache <<: *pull-cache
stage: test stage: test
script: script:
...@@ -121,8 +125,7 @@ stages: ...@@ -121,8 +125,7 @@ stages:
.spinach-metadata: &spinach-metadata .spinach-metadata: &spinach-metadata
<<: *dedicated-runner <<: *dedicated-runner
<<: *except-docs <<: *except-docs-and-qa
<<: *except-qa
<<: *pull-cache <<: *pull-cache
stage: test stage: test
script: script:
...@@ -222,8 +225,7 @@ review-docs-cleanup: ...@@ -222,8 +225,7 @@ review-docs-cleanup:
# Retrieve knapsack and rspec_flaky reports # Retrieve knapsack and rspec_flaky reports
retrieve-tests-metadata: retrieve-tests-metadata:
<<: *tests-metadata-state <<: *tests-metadata-state
<<: *except-docs <<: *except-docs-and-qa
<<: *except-qa
stage: prepare stage: prepare
cache: cache:
key: tests_metadata key: tests_metadata
...@@ -378,8 +380,7 @@ spinach-mysql 3 4: *spinach-metadata-mysql ...@@ -378,8 +380,7 @@ spinach-mysql 3 4: *spinach-metadata-mysql
.rake-exec: &rake-exec .rake-exec: &rake-exec
<<: *dedicated-runner <<: *dedicated-runner
<<: *except-docs <<: *except-docs-and-qa
<<: *except-qa
<<: *pull-cache <<: *pull-cache
<<: *ruby-static-analysis <<: *ruby-static-analysis
stage: test stage: test
...@@ -443,8 +444,7 @@ ee_compat_check: ...@@ -443,8 +444,7 @@ ee_compat_check:
# DB migration, rollback, and seed jobs # DB migration, rollback, and seed jobs
.db-migrate-reset: &db-migrate-reset .db-migrate-reset: &db-migrate-reset
<<: *dedicated-runner <<: *dedicated-runner
<<: *except-docs <<: *except-docs-and-qa
<<: *except-qa
<<: *pull-cache <<: *pull-cache
stage: test stage: test
script: script:
...@@ -466,8 +466,7 @@ db:check-schema-pg: ...@@ -466,8 +466,7 @@ db:check-schema-pg:
.migration-paths: &migration-paths .migration-paths: &migration-paths
<<: *dedicated-runner <<: *dedicated-runner
<<: *except-docs <<: *except-docs-and-qa
<<: *except-qa
<<: *pull-cache <<: *pull-cache
stage: test stage: test
variables: variables:
...@@ -494,8 +493,7 @@ migration:path-mysql: ...@@ -494,8 +493,7 @@ migration:path-mysql:
.db-rollback: &db-rollback .db-rollback: &db-rollback
<<: *dedicated-runner <<: *dedicated-runner
<<: *except-docs <<: *except-docs-and-qa
<<: *except-qa
<<: *pull-cache <<: *pull-cache
stage: test stage: test
script: script:
...@@ -512,8 +510,7 @@ db:rollback-mysql: ...@@ -512,8 +510,7 @@ db:rollback-mysql:
.db-seed_fu: &db-seed_fu .db-seed_fu: &db-seed_fu
<<: *dedicated-runner <<: *dedicated-runner
<<: *except-docs <<: *except-docs-and-qa
<<: *except-qa
<<: *pull-cache <<: *pull-cache
stage: test stage: test
variables: variables:
...@@ -541,8 +538,7 @@ db:seed_fu-mysql: ...@@ -541,8 +538,7 @@ db:seed_fu-mysql:
# Frontend-related jobs # Frontend-related jobs
gitlab:assets:compile: gitlab:assets:compile:
<<: *dedicated-runner <<: *dedicated-runner
<<: *except-docs <<: *except-docs-and-qa
<<: *except-qa
<<: *pull-cache <<: *pull-cache
stage: test stage: test
dependencies: [] dependencies: []
...@@ -564,8 +560,7 @@ gitlab:assets:compile: ...@@ -564,8 +560,7 @@ gitlab:assets:compile:
karma: karma:
<<: *dedicated-runner <<: *dedicated-runner
<<: *except-docs <<: *except-docs-and-qa
<<: *except-qa
<<: *pull-cache <<: *pull-cache
<<: *use-pg <<: *use-pg
stage: test stage: test
...@@ -619,8 +614,7 @@ qa:internal: ...@@ -619,8 +614,7 @@ qa:internal:
coverage: coverage:
<<: *dedicated-runner <<: *dedicated-runner
<<: *except-docs <<: *except-docs-and-qa
<<: *except-qa
<<: *pull-cache <<: *pull-cache
stage: post-test stage: post-test
services: [] services: []
...@@ -639,8 +633,7 @@ coverage: ...@@ -639,8 +633,7 @@ coverage:
lint:javascript:report: lint:javascript:report:
<<: *dedicated-runner <<: *dedicated-runner
<<: *except-docs <<: *except-docs-and-qa
<<: *except-qa
<<: *pull-cache <<: *pull-cache
stage: post-test stage: post-test
dependencies: dependencies:
...@@ -699,8 +692,7 @@ cache gems: ...@@ -699,8 +692,7 @@ cache gems:
gitlab_git_test: gitlab_git_test:
<<: *dedicated-runner <<: *dedicated-runner
<<: *except-docs <<: *except-docs-and-qa
<<: *except-qa
<<: *pull-cache <<: *pull-cache
variables: variables:
SETUP_DB: "false" SETUP_DB: "false"
......
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