diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-07-23 14:10:16 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-07-23 14:10:16 +0000 |
| commit | b5cc47bda6cefc1aa75e9e388f656609246ca326 (patch) | |
| tree | 3fec3ebe950fb05fde8d8932fb498947e9e9ed78 | |
| parent | c404c57fb8b5a6ca174e6fccb25cf057549a7a6f (diff) | |
| parent | 9c804111e7717c90249c88c8f96119043ffad378 (diff) | |
| download | gitlab-ce-b5cc47bda6cefc1aa75e9e388f656609246ca326.tar.gz | |
Merge branch '64756-re-enable-junit-reports' into 'master'
Enable Junit reports
Closes #64756
See merge request gitlab-org/gitlab-ce!30931
| -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 5d4bbc06e93..fe369ffec13 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 |