From 0debaf69dc5d7d3687caec6aa78b50ad56c325f5 Mon Sep 17 00:00:00 2001 From: Rob Wood Date: Tue, 22 Jan 2019 15:01:31 +0000 Subject: [PATCH] Bug 1520523 - Update Chromium version running with Raptor in production; r=davehunt Differential Revision: https://phabricator.services.mozilla.com/D16724 --HG-- extra : moz-landing-system : lando --- .../mozharness/mozilla/testing/raptor.py | 19 ++++++++++--------- testing/raptor/raptor/raptor.py | 4 +++- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/testing/mozharness/mozharness/mozilla/testing/raptor.py b/testing/mozharness/mozharness/mozilla/testing/raptor.py index 96678aa2a5ca..89ae185bcc7c 100644 --- a/testing/mozharness/mozharness/mozilla/testing/raptor.py +++ b/testing/mozharness/mozharness/mozilla/testing/raptor.py @@ -263,6 +263,10 @@ class Raptor(TestingMixin, MercurialScript, CodeCoverageMixin, AndroidMixin): if 'mac' in self.platform_name(): # for now hardcoding a revision; but change this to update to newer version; from: # http://commondatastorage.googleapis.com/chromium-browser-snapshots/Mac/LAST_CHANGE + + # Note: Using an older version of Chromium on OSX b/c of an issue with a pop-up + # dialog appearing with newer Chromium on OSX; please see: + # Bug 1520523 - Update Chromium version running with Raptor in production chromium_rev = "575625" chrome_archive_file = "chrome-mac.zip" chrome_url = "%s/Mac/%s/%s" % (base_url, chromium_rev, chrome_archive_file) @@ -272,7 +276,7 @@ class Raptor(TestingMixin, MercurialScript, CodeCoverageMixin, AndroidMixin): elif 'linux' in self.platform_name(): # for now hardcoding a revision; but change this to update to newer version; from: # http://commondatastorage.googleapis.com/chromium-browser-snapshots/Linux_x64/LAST_CHANGE - chromium_rev = "575640" + chromium_rev = "624137" chrome_archive_file = "chrome-linux.zip" chrome_url = "%s/Linux_x64/%s/%s" % (base_url, chromium_rev, chrome_archive_file) self.chrome_path = os.path.join(self.chrome_dest, 'chrome-linux', 'chrome') @@ -281,16 +285,13 @@ class Raptor(TestingMixin, MercurialScript, CodeCoverageMixin, AndroidMixin): # windows 7/10 # for now hardcoding a revision; but change this to update to newer version; from: # http://commondatastorage.googleapis.com/chromium-browser-snapshots/Win_x64/LAST_CHANGE - chromium_rev = "575637" - chrome_archive_file = "chrome-win32.zip" # same zip name for win32/64 + chromium_rev = "624131" + chrome_archive_file = "chrome-win.zip" # same zip name for win32/64 - # url is different for win32/64 - if '64' in self.platform_name(): - chrome_url = "%s/Win_x64/%s/%s" % (base_url, chromium_rev, chrome_archive_file) - else: - chrome_url = "%s/Win_x32/%s/%s" % (base_url, chromium_rev, chrome_archive_file) + # one url for Win x64/32 + chrome_url = "%s/Win_x64/%s/%s" % (base_url, chromium_rev, chrome_archive_file) - self.chrome_path = os.path.join(self.chrome_dest, 'chrome-win32', 'Chrome.exe') + self.chrome_path = os.path.join(self.chrome_dest, 'chrome-win', 'Chrome.exe') chrome_archive = os.path.join(self.chrome_dest, chrome_archive_file) diff --git a/testing/raptor/raptor/raptor.py b/testing/raptor/raptor/raptor.py index 9a96b9c529ef..104630e19324 100644 --- a/testing/raptor/raptor/raptor.py +++ b/testing/raptor/raptor/raptor.py @@ -367,7 +367,9 @@ class Raptor(object): chrome_args = [ '--proxy-server="http=127.0.0.1:8080;' + 'https=127.0.0.1:8080;ssl=127.0.0.1:8080"', - '--ignore-certificate-errors' + '--ignore-certificate-errors', + '--no-default-browser-check', + 'disable-sync' ] if self.config['host'] not in ('localhost', '127.0.0.1'): chrome_args[0] = chrome_args[0].replace('127.0.0.1', self.config['host'])