diff options
author | Tim Zallmann <tzallmann@gitlab.com> | 2017-06-16 07:06:39 +0000 |
---|---|---|
committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-06-16 07:06:39 +0000 |
commit | 446f37872f6b493f1f27055f26abb66fcf8d435a (patch) | |
tree | 2271275f1ad2c20534261fcc96a9fc5b4575f2bc /.gitlab-ci.yml | |
parent | c676e79e6f5344e8a45d9cd262055729939a54b9 (diff) | |
parent | 132be812d1c4ecf185f8839432f6bcafa13880e5 (diff) | |
download | gitlab-ce-446f37872f6b493f1f27055f26abb66fcf8d435a.tar.gz |
Merge branch 'karma-headless-chrome-redux' into 'master'33592-pipeline-schedules-callout-has-no-top-margin
Replace PhantomJS with Chrome in Karma test runner (2nd attempt)
Closes #33633
See merge request !12144
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c6868931657..f0c266485b6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -441,19 +441,23 @@ gitlab:assets:compile: - webpack-report/ karma: + image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3.3-golang-1.8-git-2.7-chrome-59.0-node-7.1-postgresql-9.6" stage: test <<: *use-pg <<: *dedicated-runner <<: *except-docs variables: BABEL_ENV: "coverage" + CHROME_LOG_FILE: "chrome_debug.log" script: - bundle exec rake karma coverage: '/^Statements *: (\d+\.\d+%)/' artifacts: name: coverage-javascript expire_in: 31d + when: always paths: + - chrome_debug.log - coverage-javascript/ codeclimate: |