Commit a6e2ec0d authored by Mark Lapierre's avatar Mark Lapierre

Merge branch 'qa-contain-chrome-vars' into 'master'

Move Chrome variables under conditional

See merge request gitlab-org/gitlab-ce!28505
parents 4edfa510 cdc68de1
...@@ -76,6 +76,9 @@ module QA ...@@ -76,6 +76,9 @@ module QA
# https://developers.google.com/web/updates/2017/04/headless-chrome#cli # https://developers.google.com/web/updates/2017/04/headless-chrome#cli
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 QA::Runtime::Env.running_in_ci?
end end
# Use the same profile on QA runs if CHROME_REUSE_PROFILE is true. # Use the same profile on QA runs if CHROME_REUSE_PROFILE is true.
...@@ -85,9 +88,6 @@ module QA ...@@ -85,9 +88,6 @@ module QA
options.add_argument("user-data-dir=#{qa_profile_dir}") options.add_argument("user-data-dir=#{qa_profile_dir}")
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 QA::Runtime::Env.running_in_ci?
selenium_options = { selenium_options = {
browser: QA::Runtime::Env.browser, browser: QA::Runtime::Env.browser,
clear_local_storage: true, clear_local_storage: true,
......
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