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

EE: Make sure two except won't overwrite each other

Closes gitlab-qa#140

See merge request gitlab-org/gitlab-ee!3827

.gitlab-ci.yml

@@ -88,9 +88,18 @@ stages:
   except:
     - /(^docs[\/-].*|.*-docs$)/
 
+.except-qa: &except-qa
+  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-docs-and-qa
   <<: *pull-cache
   stage: test
   script:
@@ -139,7 +148,7 @@ stages:
 
 .spinach-metadata: &spinach-metadata
   <<: *dedicated-runner
-  <<: *except-docs
+  <<: *except-docs-and-qa
   <<: *pull-cache
   stage: test
   script:
@@ -194,6 +203,7 @@ package-qa:
 # Review docs base
 .review-docs: &review-docs
   <<: *dedicated-runner
+  <<: *except-qa
   image: ruby:2.4-alpine
   before_script:
     - gem install gitlab --no-doc
@@ -238,7 +248,7 @@ review-docs-cleanup:
 # Retrieve knapsack and rspec_flaky reports
 retrieve-tests-metadata:
   <<: *tests-metadata-state
-  <<: *except-docs
+  <<: *except-docs-and-qa
   stage: prepare
   cache:
     key: tests_metadata
@@ -290,6 +300,7 @@ flaky-examples-check:
   except:
     - master
     - /(^docs[\/-].*|.*-docs$)/
+    - /(^qa[\/-].*|.*-qa$)/
   artifacts:
     expire_in: 30d
     paths:
@@ -394,7 +405,7 @@ spinach-mysql 3 4: *spinach-metadata-mysql
 
 .rake-exec: &rake-exec
   <<: *dedicated-runner
-  <<: *except-docs
+  <<: *except-docs-and-qa
   <<: *pull-cache
   <<: *ruby-static-analysis
   stage: test
@@ -414,6 +425,7 @@ static-analysis:
 # - Make sure cURL examples in API docs use the full switches
 docs lint:
   <<: *dedicated-runner
+  <<: *except-qa
   image: "registry.gitlab.com/gitlab-org/gitlab-build-images:nanoc-bootstrap-ruby-2.4-alpine"
   stage: test
   cache: {}
@@ -436,6 +448,7 @@ downtime_check:
     - tags
     - /^[\d-]+-stable(-ee)?$/
     - /(^docs[\/-].*|.*-docs$)/
+    - /(^qa[\/-].*|.*-qa$)/
 
 ee_compat_check:
   <<: *rake-exec
@@ -456,7 +469,7 @@ ee_compat_check:
 # DB migration, rollback, and seed jobs
 .db-migrate-reset: &db-migrate-reset
   <<: *dedicated-runner
-  <<: *except-docs
+  <<: *except-docs-and-qa
   <<: *pull-cache
   stage: test
   script:
@@ -478,7 +491,7 @@ db:check-schema-pg:
 
 .migration-paths: &migration-paths
   <<: *dedicated-runner
-  <<: *except-docs
+  <<: *except-docs-and-qa
   <<: *pull-cache
   stage: test
   variables:
@@ -505,7 +518,7 @@ migration:path-mysql:
 
 .db-rollback: &db-rollback
   <<: *dedicated-runner
-  <<: *except-docs
+  <<: *except-docs-and-qa
   <<: *pull-cache
   stage: test
   script:
@@ -522,7 +535,7 @@ db:rollback-mysql:
 
 .db-seed_fu: &db-seed_fu
   <<: *dedicated-runner
-  <<: *except-docs
+  <<: *except-docs-and-qa
   <<: *pull-cache
   stage: test
   variables:
@@ -550,7 +563,7 @@ db:seed_fu-mysql:
 # Frontend-related jobs
 gitlab:assets:compile:
   <<: *dedicated-runner
-  <<: *except-docs
+  <<: *except-docs-and-qa
   <<: *pull-cache
   stage: test
   dependencies: []
@@ -572,7 +585,7 @@ gitlab:assets:compile:
 
 karma:
   <<: *dedicated-runner
-  <<: *except-docs
+  <<: *except-docs-and-qa
   <<: *pull-cache
   <<: *use-pg
   stage: test
@@ -626,7 +639,7 @@ qa:internal:
 
 coverage:
   <<: *dedicated-runner
-  <<: *except-docs
+  <<: *except-docs-and-qa
   <<: *pull-cache
   stage: post-test
   services: []
@@ -645,7 +658,7 @@ coverage:
 
 lint:javascript:report:
   <<: *dedicated-runner
-  <<: *except-docs
+  <<: *except-docs-and-qa
   <<: *pull-cache
   stage: post-test
   dependencies:
@@ -704,7 +717,7 @@ cache gems:
 
 gitlab_git_test:
   <<: *dedicated-runner
-  <<: *except-docs
+  <<: *except-docs-and-qa
   <<: *pull-cache
   variables:
     SETUP_DB: "false"