summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml3
-rw-r--r--config/karma.config.js9
2 files changed, 5 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 91abe474c73..8a69757411f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -448,16 +448,13 @@ karma:
<<: *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/
coverage:
diff --git a/config/karma.config.js b/config/karma.config.js
index cfb0a0cb101..ecbd7d4e3e8 100644
--- a/config/karma.config.js
+++ b/config/karma.config.js
@@ -21,11 +21,13 @@ module.exports = function(config) {
var karmaConfig = {
basePath: ROOT_PATH,
- browsers: ['ChromeDebug'],
+ browsers: ['ChromeHeadlessNoSandbox'],
customLaunchers: {
- ChromeDebug: {
+ ChromeHeadlessNoSandbox: {
base: 'ChromeHeadless',
- flags: ['--enable-logging', '--v=1'],
+ // chrome cannot run in sandboxed mode inside a docker container unless it is run with
+ // escalated kernel privileges: docker run --cap-add=CAP_SYS_ADMIN
+ flags: ['--no-sandbox'],
displayName: 'Chrome'
}
},
@@ -40,7 +42,6 @@ module.exports = function(config) {
reporters: [progressReporter],
webpack: webpackConfig,
webpackMiddleware: { stats: 'errors-only' },
- logLevel: config.LOG_DEBUG,
};
if (process.env.BABEL_ENV === 'coverage' || process.env.NODE_ENV === 'coverage') {