summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-12-18 10:26:06 +0000
committerRémy Coutable <remy@rymai.me>2017-12-18 10:26:06 +0000
commitb4ea25cafa0c7768a8618c673f9a1830f27fc950 (patch)
tree86812d8ed27480697c232864699033b35129e104
parent2bad3b0eaf855a8050e565a05deebdf323ca4fd2 (diff)
parent0a9597f1d245af4278a0ce509df386fe841c8925 (diff)
downloadgitlab-ce-b4ea25cafa0c7768a8618c673f9a1830f27fc950.tar.gz
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
-rw-r--r--.gitlab-ci.yml21
1 files changed, 21 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e4499b85fe1..d35fd28c766 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:
@@ -369,6 +378,7 @@ spinach-mysql 3 4: *spinach-metadata-mysql
<<: *ruby-static-analysis
<<: *dedicated-runner
<<: *except-docs
+ <<: *except-qa
<<: *pull-cache
stage: test
script:
@@ -387,6 +397,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 +420,7 @@ downtime_check:
- tags
- /^[\d-]+-stable(-ee)?$/
- /(^docs[\/-].*|.*-docs$)/
+ - /(^qa[\/-].*|.*-qa$)/
ee_compat_check:
<<: *rake-exec
@@ -430,6 +442,7 @@ ee_compat_check:
.db-migrate-reset: &db-migrate-reset
<<: *dedicated-runner
<<: *except-docs
+ <<: *except-qa
<<: *pull-cache
stage: test
script:
@@ -447,6 +460,7 @@ db:migrate:reset-mysql:
<<: *dedicated-runner
<<: *pull-cache
<<: *except-docs
+ <<: *except-qa
stage: test
variables:
SETUP_DB: "false"
@@ -473,6 +487,7 @@ migration:path-mysql:
.db-rollback: &db-rollback
<<: *dedicated-runner
<<: *except-docs
+ <<: *except-qa
<<: *pull-cache
stage: test
script:
@@ -490,6 +505,7 @@ db:rollback-mysql:
.db-seed_fu: &db-seed_fu
<<: *dedicated-runner
<<: *except-docs
+ <<: *except-qa
<<: *pull-cache
stage: test
variables:
@@ -524,6 +540,7 @@ db:check-schema-pg:
gitlab:assets:compile:
<<: *dedicated-runner
<<: *except-docs
+ <<: *except-qa
<<: *pull-cache
stage: test
dependencies: []
@@ -547,6 +564,7 @@ karma:
<<: *use-pg
<<: *dedicated-runner
<<: *except-docs
+ <<: *except-qa
<<: *pull-cache
stage: test
variables:
@@ -599,6 +617,7 @@ qa:internal:
coverage:
<<: *dedicated-runner
<<: *except-docs
+ <<: *except-qa
<<: *pull-cache
stage: post-test
services: []
@@ -618,6 +637,7 @@ coverage:
lint:javascript:report:
<<: *dedicated-runner
<<: *except-docs
+ <<: *except-qa
<<: *pull-cache
stage: post-test
dependencies:
@@ -677,6 +697,7 @@ cache gems:
gitlab_git_test:
<<: *pull-cache
<<: *except-docs
+ <<: *except-qa
variables:
SETUP_DB: "false"
script: