Commit 4f38c758 authored by Anastasia McDonald's avatar Anastasia McDonald

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

Add env variable to disable qa dev-shm

See merge request gitlab-org/gitlab!74123
parents 275925fb 8b80f5c7
...@@ -99,7 +99,7 @@ module QA ...@@ -99,7 +99,7 @@ module QA
end end
# Disable /dev/shm use in CI. See https://gitlab.com/gitlab-org/gitlab/issues/4252 # Disable /dev/shm use in CI. See https://gitlab.com/gitlab-org/gitlab/issues/4252
capabilities['goog:chromeOptions'][:args] << 'disable-dev-shm-usage' if QA::Runtime::Env.running_in_ci? capabilities['goog:chromeOptions'][:args] << 'disable-dev-shm-usage' if QA::Runtime::Env.disable_dev_shm?
# Specify the user-agent to allow challenges to be bypassed # Specify the user-agent to allow challenges to be bypassed
# See https://gitlab.com/gitlab-com/gl-infra/infrastructure/-/issues/11938 # See https://gitlab.com/gitlab-com/gl-infra/infrastructure/-/issues/11938
......
...@@ -80,6 +80,11 @@ module QA ...@@ -80,6 +80,11 @@ module QA
enabled?(ENV['CHROME_REUSE_PROFILE'], default: false) enabled?(ENV['CHROME_REUSE_PROFILE'], default: false)
end end
# Disable /dev/shm use in CI. See https://gitlab.com/gitlab-org/gitlab/issues/4252
def disable_dev_shm?
running_in_ci? || enabled?(ENV['CHROME_DISABLE_DEV_SHM'], default: false)
end
def accept_insecure_certs? def accept_insecure_certs?
enabled?(ENV['ACCEPT_INSECURE_CERTS']) enabled?(ENV['ACCEPT_INSECURE_CERTS'])
end end
......
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