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

Disable /dev/shm in CI See merge request gitlab-org/gitlab-ce!16105

Merge branch 'sh-disable-dev-shm' into 'master'
Disable /dev/shm in CI See merge request gitlab-org/gitlab-ce!16105
5512f0aa · Rémy Coutable · 46be07d2 · f7ffe27c · 5512f0aa · 5512f0aa
Commit 5512f0aa authored Dec 23, 2017 by Rémy Coutable
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

features/support/capybara.rb features/support/capybara.rb +3 -0

spec/support/capybara.rb spec/support/capybara.rb +3 -0

No files found.
--- 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,

--- 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,