Commit 5512f0aa authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'sh-disable-dev-shm' into 'master'

Disable /dev/shm in CI

See merge request gitlab-org/gitlab-ce!16105
parents 46be07d2 f7ffe27c
...@@ -29,6 +29,9 @@ Capybara.register_driver :chrome do |app| ...@@ -29,6 +29,9 @@ Capybara.register_driver :chrome do |app|
options.add_argument("disable-gpu") options.add_argument("disable-gpu")
end 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( Capybara::Selenium::Driver.new(
app, app,
browser: :chrome, browser: :chrome,
......
...@@ -33,6 +33,9 @@ Capybara.register_driver :chrome do |app| ...@@ -33,6 +33,9 @@ Capybara.register_driver :chrome do |app|
options.add_argument("disable-gpu") options.add_argument("disable-gpu")
end 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( Capybara::Selenium::Driver.new(
app, app,
browser: :chrome, browser: :chrome,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment