summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-06-22 13:51:47 +0200
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-06-22 13:51:47 +0200
commit5981fff500d3671366d4a943aca69c6ef88b7e79 (patch)
tree099021b3a7770ef05fe61e84c03f5949e4603898
parentbf0b233fc6bd107b08e203b601697bdee8503dcc (diff)
downloadgitlab-ce-33538-update-ci-dockerfile-now-that-chrome-headless-no-longer-in-beta.tar.gz
-rw-r--r--qa/Dockerfile2
-rw-r--r--qa/qa/specs/config.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/qa/Dockerfile b/qa/Dockerfile
index 6afb614cc62..97ae1961e34 100644
--- a/qa/Dockerfile
+++ b/qa/Dockerfile
@@ -1,7 +1,7 @@
FROM ruby:2.3
LABEL maintainer "Grzegorz Bizon <grzegorz@gitlab.com>"
-ENV CHROME_VERSION 59.0.3071.104-1
+ENV CHROME_VERSION 59.0.3071.109-1
ENV CHROME_DRIVER_VERSION 2.30
##
diff --git a/qa/qa/specs/config.rb b/qa/qa/specs/config.rb
index 78a93828d36..b341aa3094a 100644
--- a/qa/qa/specs/config.rb
+++ b/qa/qa/specs/config.rb
@@ -55,7 +55,7 @@ module QA
Capybara.register_driver :chrome do |app|
capabilities = Selenium::WebDriver::Remote::Capabilities.chrome(
'chromeOptions' => {
- 'binary' => '/opt/google/chrome-beta/google-chrome-beta',
+ 'binary' => '/usr/bin/google-chrome-stable',
'args' => %w[headless no-sandbox disable-gpu]
}
)