diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-12-23 13:43:17 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-12-23 13:43:17 +0000 |
| commit | 5512f0aaf5a4814fbea5a697076a97ff2db00c00 (patch) | |
| tree | 849860bdb9222665d78d03ea2102474f62f7e895 | |
| parent | 46be07d2c1da93cffd59fb03036e357c04ff6f3b (diff) | |
| parent | f7ffe27c2e4075789ccd9e798c8a88c9e1d85a4e (diff) | |
| download | gitlab-ce-5512f0aaf5a4814fbea5a697076a97ff2db00c00.tar.gz | |
Merge branch 'sh-disable-dev-shm' into 'master'
Disable /dev/shm in CI
See merge request gitlab-org/gitlab-ce!16105
| -rw-r--r-- | features/support/capybara.rb | 3 | ||||
| -rw-r--r-- | spec/support/capybara.rb | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/features/support/capybara.rb b/features/support/capybara.rb index 5a77b859113..4e2b3c67af5 100644 --- a/features/support/capybara.rb +++ b/features/support/capybara.rb @@ -29,6 +29,9 @@ Capybara.register_driver :chrome do |app| options.add_argument("disable-gpu") end + # Disable /dev/shm use in CI. See https://gitlab.com/gitlab-org/gitlab-ee/issues/4252 + options.add_argument("disable-dev-shm-usage") if ENV['CI'] || ENV['CI_SERVER'] + Capybara::Selenium::Driver.new( app, browser: :chrome, diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb index 935b170a0f6..5189c57b7db 100644 --- a/spec/support/capybara.rb +++ b/spec/support/capybara.rb @@ -33,6 +33,9 @@ Capybara.register_driver :chrome do |app| options.add_argument("disable-gpu") end + # Disable /dev/shm use in CI. See https://gitlab.com/gitlab-org/gitlab-ee/issues/4252 + options.add_argument("disable-dev-shm-usage") if ENV['CI'] || ENV['CI_SERVER'] + Capybara::Selenium::Driver.new( app, browser: :chrome, |