Skip to content
Snippets Groups Projects
Commit 73f615a5 authored by Lin Jen-Shin's avatar Lin Jen-Shin
Browse files

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...
parent 888ed309
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -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:
Loading
Loading
@@ -121,8 +125,7 @@ stages:
 
.spinach-metadata: &spinach-metadata
<<: *dedicated-runner
<<: *except-docs
<<: *except-qa
<<: *except-docs-and-qa
<<: *pull-cache
stage: test
script:
Loading
Loading
@@ -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
Loading
Loading
@@ -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
Loading
Loading
@@ -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:
Loading
Loading
@@ -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:
Loading
Loading
@@ -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:
Loading
Loading
@@ -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:
Loading
Loading
@@ -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: []
Loading
Loading
@@ -564,8 +560,7 @@ gitlab:assets:compile:
 
karma:
<<: *dedicated-runner
<<: *except-docs
<<: *except-qa
<<: *except-docs-and-qa
<<: *pull-cache
<<: *use-pg
stage: test
Loading
Loading
@@ -619,8 +614,7 @@ qa:internal:
 
coverage:
<<: *dedicated-runner
<<: *except-docs
<<: *except-qa
<<: *except-docs-and-qa
<<: *pull-cache
stage: post-test
services: []
Loading
Loading
@@ -639,8 +633,7 @@ coverage:
 
lint:javascript:report:
<<: *dedicated-runner
<<: *except-docs
<<: *except-qa
<<: *except-docs-and-qa
<<: *pull-cache
stage: post-test
dependencies:
Loading
Loading
@@ -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"
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment