diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-23 15:08:41 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-23 15:08:41 +0000 |
| commit | 5eeb39104356356bec81abe19479bca591e6f299 (patch) | |
| tree | 7534ccf94fb8100ce39b78278d275b2061773f95 /.gitlab | |
| parent | b7e512c8970dcce6feabc096885c7a1ea91e4694 (diff) | |
| download | gitlab-ce-5eeb39104356356bec81abe19479bca591e6f299.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/frontend.gitlab-ci.yml | 3 | ||||
| -rw-r--r-- | .gitlab/ci/rails.gitlab-ci.yml | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml index 62123ea07ff..72ef88cfeee 100644 --- a/.gitlab/ci/frontend.gitlab-ci.yml +++ b/.gitlab/ci/frontend.gitlab-ci.yml @@ -159,6 +159,7 @@ karma: - tmp/tests/frontend/ reports: junit: junit_karma.xml + cobertura: coverage-javascript/cobertura-coverage.xml karma-as-if-foss: extends: @@ -226,6 +227,8 @@ coverage-frontend: expire_in: 31d paths: - coverage-frontend/ + reports: + cobertura: coverage-frontend/cobertura-coverage.xml .qa-frontend-node: extends: diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index 535cbce0bba..657501337c4 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -256,6 +256,8 @@ rspec:coverage: - coverage/index.html - coverage/assets/ - tmp/memory_test/ + reports: + cobertura: coverage/coverage.xml # EE/FOSS: default refs (MRs, master, schedules) jobs # ####################################################### |