diff options
| author | Phil Hughes <me@iamphill.com> | 2019-07-19 14:23:41 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-07-19 14:23:41 +0000 |
| commit | b83a4f8327caa93b4857aacceff95d44c214702c (patch) | |
| tree | 8c6d31fd41748c42b9a488aa159f98484cb583d2 /.gitlab | |
| parent | 4c30b0a1cf5ead26d20845b82ae528fcbdf98728 (diff) | |
| parent | 444a3627b6d469819f33e875dc194765d6b55b8e (diff) | |
| download | gitlab-ce-b83a4f8327caa93b4857aacceff95d44c214702c.tar.gz | |
Merge branch '64722-mg-export-frontend-fixtures' into 'master'
Resolve "Export frontend fixtures as pipeline artifact"
Closes #64722 and #59166
See merge request gitlab-org/gitlab-ce!30917
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/frontend.gitlab-ci.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml index 73d45d10b01..b00d2f46088 100644 --- a/.gitlab/ci/frontend.gitlab-ci.yml +++ b/.gitlab/ci/frontend.gitlab-ci.yml @@ -137,6 +137,7 @@ karma: paths: - chrome_debug.log - coverage-javascript/ + - tmp/tests/frontend/ # see https://gitlab.com/gitlab-org/gitlab-ce/issues/64756 # reports: # junit: junit_karma.xml @@ -151,7 +152,7 @@ jest: script: - scripts/gitaly-test-spawn - date - - bundle exec rake karma:fixtures + - bundle exec rake frontend:fixtures - date - yarn jest --ci --coverage artifacts: @@ -161,6 +162,7 @@ jest: paths: - coverage-frontend/ - junit_jest.xml + - tmp/tests/frontend/ # see https://gitlab.com/gitlab-org/gitlab-ce/issues/64756 # reports: # junit: junit_jest.xml |