diff options
| author | Steve Azzopardi <sazzopardi@gitlab.com> | 2019-07-19 08:53:53 +0200 |
|---|---|---|
| committer | Steve Azzopardi <sazzopardi@gitlab.com> | 2019-07-19 16:39:32 +0200 |
| commit | 9c804111e7717c90249c88c8f96119043ffad378 (patch) | |
| tree | 7d3fe443c9f2173a69ba948fd531b35460c03d0d | |
| parent | 8291a58124e8f0987b3e17a22ca1123b5dc14f1b (diff) | |
| download | gitlab-ce-9c804111e7717c90249c88c8f96119043ffad378.tar.gz | |
Enable Junit reports64756-re-enable-junit-reports
With https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/30254 Junit
reports were disabled. With
https://gitlab.com/gitlab-com/gl-infra/production/issues/928 and
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/30274 solved we
should enable them again.
closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64756
| -rw-r--r-- | .gitlab/ci/frontend.gitlab-ci.yml | 10 | ||||
| -rw-r--r-- | .gitlab/ci/rails.gitlab-ci.yml | 5 |
2 files changed, 6 insertions, 9 deletions
diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml index b00d2f46088..6e3ecfc586e 100644 --- a/.gitlab/ci/frontend.gitlab-ci.yml +++ b/.gitlab/ci/frontend.gitlab-ci.yml @@ -138,9 +138,8 @@ karma: - chrome_debug.log - coverage-javascript/ - tmp/tests/frontend/ -# see https://gitlab.com/gitlab-org/gitlab-ce/issues/64756 -# reports: -# junit: junit_karma.xml + reports: + junit: junit_karma.xml jest: extends: .dedicated-no-docs-and-no-qa-pull-cache-job @@ -163,9 +162,8 @@ jest: - coverage-frontend/ - junit_jest.xml - tmp/tests/frontend/ -# see https://gitlab.com/gitlab-org/gitlab-ce/issues/64756 -# reports: -# junit: junit_jest.xml + reports: + junit: junit_jest.xml cache: key: jest paths: diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index d0b1f1ab98f..1392768127b 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -80,9 +80,8 @@ - rspec_profiling/ - tmp/capybara/ - tmp/memory_test/ -# see https://gitlab.com/gitlab-org/gitlab-ce/issues/64756 -# reports: -# junit: junit_rspec.xml + reports: + junit: junit_rspec.xml .rspec-metadata-pg: &rspec-metadata-pg <<: *rspec-metadata |