diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-04-05 10:25:35 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-04-05 10:25:35 +0000 |
| commit | c93dc12594aa550e17c485222d841b6d8f476204 (patch) | |
| tree | bff86bdd64d8adcce0e114437ec97be3629f02ce | |
| parent | dda326f1d390e360567ba8acaa135a1dfb98042c (diff) | |
| parent | 32135b1ffc5eda0e4744fbdbbd4ba0980b399686 (diff) | |
| download | gitlab-ce-c93dc12594aa550e17c485222d841b6d8f476204.tar.gz | |
Merge branch '44710-coverage-information-for-this-repo-is-wrong' into 'master'
Resolve "Coverage information for this repo is wrong"
Closes #44710
See merge request gitlab-org/gitlab-ce!18193
| -rw-r--r-- | .gitlab-ci.yml | 8 |
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 |