Commit d9362b8c authored by Rémy Coutable's avatar Rémy Coutable Committed by Lin Jen-Shin

Merge branch 'qa/gb/optimize-qa-pipeline' into 'master'

Optimize QA pipeline and don't run irrelevant jobs

Closes gitlab-qa#140

See merge request gitlab-org/gitlab-ce!15977
parent 1671614a
...@@ -88,9 +88,14 @@ stages: ...@@ -88,9 +88,14 @@ stages:
except: except:
- /(^docs[\/-].*|.*-docs$)/ - /(^docs[\/-].*|.*-docs$)/
.except-qa: &except-qa
except:
- /(^qa[\/-].*|.*-qa$)/
.rspec-metadata: &rspec-metadata .rspec-metadata: &rspec-metadata
<<: *dedicated-runner <<: *dedicated-runner
<<: *except-docs <<: *except-docs
<<: *except-qa
<<: *pull-cache <<: *pull-cache
stage: test stage: test
script: script:
...@@ -140,6 +145,7 @@ stages: ...@@ -140,6 +145,7 @@ stages:
.spinach-metadata: &spinach-metadata .spinach-metadata: &spinach-metadata
<<: *dedicated-runner <<: *dedicated-runner
<<: *except-docs <<: *except-docs
<<: *except-qa
<<: *pull-cache <<: *pull-cache
stage: test stage: test
script: script:
...@@ -194,6 +200,7 @@ package-qa: ...@@ -194,6 +200,7 @@ package-qa:
# Review docs base # Review docs base
.review-docs: &review-docs .review-docs: &review-docs
<<: *dedicated-runner <<: *dedicated-runner
<<: *except-qa
image: ruby:2.4-alpine image: ruby:2.4-alpine
before_script: before_script:
- gem install gitlab --no-doc - gem install gitlab --no-doc
...@@ -239,6 +246,7 @@ review-docs-cleanup: ...@@ -239,6 +246,7 @@ review-docs-cleanup:
retrieve-tests-metadata: retrieve-tests-metadata:
<<: *tests-metadata-state <<: *tests-metadata-state
<<: *except-docs <<: *except-docs
<<: *except-qa
stage: prepare stage: prepare
cache: cache:
key: tests_metadata key: tests_metadata
...@@ -290,6 +298,7 @@ flaky-examples-check: ...@@ -290,6 +298,7 @@ flaky-examples-check:
except: except:
- master - master
- /(^docs[\/-].*|.*-docs$)/ - /(^docs[\/-].*|.*-docs$)/
- /(^qa[\/-].*|.*-qa$)/
artifacts: artifacts:
expire_in: 30d expire_in: 30d
paths: paths:
...@@ -395,6 +404,7 @@ spinach-mysql 3 4: *spinach-metadata-mysql ...@@ -395,6 +404,7 @@ spinach-mysql 3 4: *spinach-metadata-mysql
.rake-exec: &rake-exec .rake-exec: &rake-exec
<<: *dedicated-runner <<: *dedicated-runner
<<: *except-docs <<: *except-docs
<<: *except-qa
<<: *pull-cache <<: *pull-cache
<<: *ruby-static-analysis <<: *ruby-static-analysis
stage: test stage: test
...@@ -414,6 +424,7 @@ static-analysis: ...@@ -414,6 +424,7 @@ static-analysis:
# - Make sure cURL examples in API docs use the full switches # - Make sure cURL examples in API docs use the full switches
docs lint: docs lint:
<<: *dedicated-runner <<: *dedicated-runner
<<: *except-qa
image: "registry.gitlab.com/gitlab-org/gitlab-build-images:nanoc-bootstrap-ruby-2.4-alpine" image: "registry.gitlab.com/gitlab-org/gitlab-build-images:nanoc-bootstrap-ruby-2.4-alpine"
stage: test stage: test
cache: {} cache: {}
...@@ -436,6 +447,7 @@ downtime_check: ...@@ -436,6 +447,7 @@ downtime_check:
- tags - tags
- /^[\d-]+-stable(-ee)?$/ - /^[\d-]+-stable(-ee)?$/
- /(^docs[\/-].*|.*-docs$)/ - /(^docs[\/-].*|.*-docs$)/
- /(^qa[\/-].*|.*-qa$)/
ee_compat_check: ee_compat_check:
<<: *rake-exec <<: *rake-exec
...@@ -457,6 +469,7 @@ ee_compat_check: ...@@ -457,6 +469,7 @@ ee_compat_check:
.db-migrate-reset: &db-migrate-reset .db-migrate-reset: &db-migrate-reset
<<: *dedicated-runner <<: *dedicated-runner
<<: *except-docs <<: *except-docs
<<: *except-qa
<<: *pull-cache <<: *pull-cache
stage: test stage: test
script: script:
...@@ -479,6 +492,7 @@ db:check-schema-pg: ...@@ -479,6 +492,7 @@ db:check-schema-pg:
.migration-paths: &migration-paths .migration-paths: &migration-paths
<<: *dedicated-runner <<: *dedicated-runner
<<: *except-docs <<: *except-docs
<<: *except-qa
<<: *pull-cache <<: *pull-cache
stage: test stage: test
variables: variables:
...@@ -506,6 +520,7 @@ migration:path-mysql: ...@@ -506,6 +520,7 @@ migration:path-mysql:
.db-rollback: &db-rollback .db-rollback: &db-rollback
<<: *dedicated-runner <<: *dedicated-runner
<<: *except-docs <<: *except-docs
<<: *except-qa
<<: *pull-cache <<: *pull-cache
stage: test stage: test
script: script:
...@@ -523,6 +538,7 @@ db:rollback-mysql: ...@@ -523,6 +538,7 @@ db:rollback-mysql:
.db-seed_fu: &db-seed_fu .db-seed_fu: &db-seed_fu
<<: *dedicated-runner <<: *dedicated-runner
<<: *except-docs <<: *except-docs
<<: *except-qa
<<: *pull-cache <<: *pull-cache
stage: test stage: test
variables: variables:
...@@ -551,6 +567,7 @@ db:seed_fu-mysql: ...@@ -551,6 +567,7 @@ db:seed_fu-mysql:
gitlab:assets:compile: gitlab:assets:compile:
<<: *dedicated-runner <<: *dedicated-runner
<<: *except-docs <<: *except-docs
<<: *except-qa
<<: *pull-cache <<: *pull-cache
stage: test stage: test
dependencies: [] dependencies: []
...@@ -573,6 +590,7 @@ gitlab:assets:compile: ...@@ -573,6 +590,7 @@ gitlab:assets:compile:
karma: karma:
<<: *dedicated-runner <<: *dedicated-runner
<<: *except-docs <<: *except-docs
<<: *except-qa
<<: *pull-cache <<: *pull-cache
<<: *use-pg <<: *use-pg
stage: test stage: test
...@@ -627,6 +645,7 @@ qa:internal: ...@@ -627,6 +645,7 @@ qa:internal:
coverage: coverage:
<<: *dedicated-runner <<: *dedicated-runner
<<: *except-docs <<: *except-docs
<<: *except-qa
<<: *pull-cache <<: *pull-cache
stage: post-test stage: post-test
services: [] services: []
...@@ -646,6 +665,7 @@ coverage: ...@@ -646,6 +665,7 @@ coverage:
lint:javascript:report: lint:javascript:report:
<<: *dedicated-runner <<: *dedicated-runner
<<: *except-docs <<: *except-docs
<<: *except-qa
<<: *pull-cache <<: *pull-cache
stage: post-test stage: post-test
dependencies: dependencies:
...@@ -705,6 +725,7 @@ cache gems: ...@@ -705,6 +725,7 @@ cache gems:
gitlab_git_test: gitlab_git_test:
<<: *dedicated-runner <<: *dedicated-runner
<<: *except-docs <<: *except-docs
<<: *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