diff options
| author | Marin Jankovski <marin@gitlab.com> | 2019-07-02 11:30:29 +0000 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2019-07-02 11:30:29 +0000 |
| commit | 34a22b831135faeb8f4c70a3b8a3b8d525ccd164 (patch) | |
| tree | 41c550d19760e72d0c81966d45ef228175386ff1 | |
| parent | e2648d1130f7498aeaa935c4311dcf6511eea94f (diff) | |
| parent | 2ce377658ee4275d9d62ff234a824a0e5c55c2af (diff) | |
| download | gitlab-ce-34a22b831135faeb8f4c70a3b8a3b8d525ccd164.tar.gz | |
Merge branch 'disable-junit-reports' into 'master'
Disable juint reports tmp
See merge request gitlab-org/gitlab-ce!30254
| -rw-r--r-- | .gitlab/ci/frontend.gitlab-ci.yml | 8 | ||||
| -rw-r--r-- | .gitlab/ci/rails.gitlab-ci.yml | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml index 8314c067d7a..6e80cb530f1 100644 --- a/.gitlab/ci/frontend.gitlab-ci.yml +++ b/.gitlab/ci/frontend.gitlab-ci.yml @@ -168,8 +168,8 @@ karma: paths: - chrome_debug.log - coverage-javascript/ - reports: - junit: junit_karma.xml +# reports: +# junit: junit_karma.xml jest: extends: .dedicated-no-docs-and-no-qa-pull-cache-job @@ -191,8 +191,8 @@ jest: paths: - coverage-frontend/ - junit_jest.xml - 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 009c18310e4..9d24099b85c 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -77,8 +77,8 @@ - rspec_flaky/ - rspec_profiling/ - tmp/capybara/ - reports: - junit: junit_rspec.xml +# reports: +# junit: junit_rspec.xml .rspec-metadata-pg: &rspec-metadata-pg <<: *rspec-metadata |