summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-04-05 11:15:59 +0200
committerRémy Coutable <remy@rymai.me>2018-04-05 11:15:59 +0200
commit32135b1ffc5eda0e4744fbdbbd4ba0980b399686 (patch)
treef23a6215c7d838c217c14e3b53fa3a507bdf0d89
parent32d2206b01b97cdbd6cdc13b25d98c3d3db048c4 (diff)
downloadgitlab-ce-32135b1ffc5eda0e4744fbdbbd4ba0980b399686.tar.gz
Fix the coverage job by making it download the artifacts from all the previous jobs44710-coverage-information-for-this-repo-is-wrong
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--.gitlab-ci.yml8
1 files changed, 7 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 90aabf5034a..433487877c0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -765,7 +765,13 @@ qa:selectors:
- bundle exec bin/qa Test::Sanity::Selectors
coverage:
- <<: *dedicated-no-docs-no-db-pull-cache-job
+ # Don't include dedicated-no-docs-no-db-pull-cache-job here since we need to
+ # download artifacts from all the rspec jobs instead of from setup-test-env only
+ <<: *dedicated-runner
+ <<: *except-docs-and-qa
+ <<: *pull-cache
+ variables:
+ SETUP_DB: "false"
stage: post-test
script:
- bundle exec scripts/merge-simplecov