Optimize QA pipeline and don't run irrelevant jobs

1 files changed, 23 insertions, 1 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e4499b85fe1..3ca38afcd90 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -76,10 +76,15 @@ stages:
   except:
     - /(^docs[\/-].*|.*-docs$)/
 
+.except-qa: &except-qa
+  except:
+    - /(^qa[\/-].*|.*-qa$)/
+
 .rspec-metadata: &rspec-metadata
   <<: *dedicated-runner
   <<: *pull-cache
   <<: *except-docs
+  <<: *except-qa
   stage: test
   script:
     - JOB_NAME=( $CI_JOB_NAME )
@@ -118,6 +123,7 @@ stages:
   <<: *dedicated-runner
   <<: *pull-cache
   <<: *except-docs
+  <<: *except-qa
   stage: test
   script:
     - JOB_NAME=( $CI_JOB_NAME )
@@ -169,6 +175,7 @@ package-qa:
 
 # Review docs base
 .review-docs: &review-docs
+  <<: *except-qa
   image: ruby:2.4-alpine
   before_script:
     - gem install gitlab --no-doc
@@ -214,6 +221,7 @@ review-docs-cleanup:
 retrieve-tests-metadata:
   <<: *tests-metadata-state
   <<: *except-docs
+  <<: *except-qa
   stage: prepare
   cache:
     key: tests_metadata
@@ -265,6 +273,7 @@ flaky-examples-check:
   except:
     - master
     - /(^docs[\/-].*|.*-docs$)/
+    - /(^qa[\/-].*|.*-qa$)/
   artifacts:
     expire_in: 30d
     paths:
@@ -278,6 +287,7 @@ setup-test-env:
   <<: *use-pg
   <<: *dedicated-runner
   <<: *except-docs
+  <<: *except-qa
   stage: prepare
   cache:
     <<: *default-cache
@@ -369,6 +379,7 @@ spinach-mysql 3 4: *spinach-metadata-mysql
   <<: *ruby-static-analysis
   <<: *dedicated-runner
   <<: *except-docs
+  <<: *except-qa
   <<: *pull-cache
   stage: test
   script:
@@ -387,6 +398,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: {}
@@ -409,6 +421,7 @@ downtime_check:
     - tags
     - /^[\d-]+-stable(-ee)?$/
     - /(^docs[\/-].*|.*-docs$)/
+    - /(^qa[\/-].*|.*-qa$)/
 
 ee_compat_check:
   <<: *rake-exec
@@ -430,6 +443,7 @@ ee_compat_check:
 .db-migrate-reset: &db-migrate-reset
   <<: *dedicated-runner
   <<: *except-docs
+  <<: *except-qa
   <<: *pull-cache
   stage: test
   script:
@@ -447,6 +461,7 @@ db:migrate:reset-mysql:
   <<: *dedicated-runner
   <<: *pull-cache
   <<: *except-docs
+  <<: *except-qa
   stage: test
   variables:
     SETUP_DB: "false"
@@ -473,6 +488,7 @@ migration:path-mysql:
 .db-rollback: &db-rollback
   <<: *dedicated-runner
   <<: *except-docs
+  <<: *except-qa
   <<: *pull-cache
   stage: test
   script:
@@ -490,6 +506,7 @@ db:rollback-mysql:
 .db-seed_fu: &db-seed_fu
   <<: *dedicated-runner
   <<: *except-docs
+  <<: *except-qa
   <<: *pull-cache
   stage: test
   variables:
@@ -524,6 +541,7 @@ db:check-schema-pg:
 gitlab:assets:compile:
   <<: *dedicated-runner
   <<: *except-docs
+  <<: *except-qa
   <<: *pull-cache
   stage: test
   dependencies: []
@@ -547,6 +565,7 @@ karma:
   <<: *use-pg
   <<: *dedicated-runner
   <<: *except-docs
+  <<: *except-qa
   <<: *pull-cache
   stage: test
   variables:
@@ -599,6 +618,7 @@ qa:internal:
 coverage:
   <<: *dedicated-runner
   <<: *except-docs
+  <<: *except-qa
   <<: *pull-cache
   stage: post-test
   services: []
@@ -618,6 +638,7 @@ coverage:
 lint:javascript:report:
   <<: *dedicated-runner
   <<: *except-docs
+  <<: *except-qa
   <<: *pull-cache
   stage: post-test
   dependencies:
@@ -674,9 +695,10 @@ cache gems:
     - master@gitlab-org/gitlab-ce
     - master@gitlab-org/gitlab-ee
 
-gitlab_git_test:
+gitlab-git_test:
   <<: *pull-cache
   <<: *except-docs
+  <<: *except-qa
   variables:
     SETUP_DB: "false"
   script: