Bug 1520523 - Update Chromium version running with Raptor in production; r=davehunt
authorRob Wood <rwood@mozilla.com>
Tue, 22 Jan 2019 15:01:31 +0000
changeset 514831 d9e1039ecab03119610f4dea535eff9d9a51c901
parent 514830 1a43fcfbf783fe3d134c30394d5d83f474faf93b
child 514832 f71ebb7632fb7e9e8f8514f377c12e9a52430da1
push id1953
push userffxbld-merge
push dateMon, 11 Mar 2019 12:10:20 +0000
treeherdermozilla-release@9c35dcbaa899 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdavehunt
bugs1520523
milestone66.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1520523 - Update Chromium version running with Raptor in production; r=davehunt Differential Revision: https://phabricator.services.mozilla.com/D16724
testing/mozharness/mozharness/mozilla/testing/raptor.py
testing/raptor/raptor/raptor.py
--- a/testing/mozharness/mozharness/mozilla/testing/raptor.py
+++ b/testing/mozharness/mozharness/mozilla/testing/raptor.py
@@ -258,44 +258,45 @@ class Raptor(TestingMixin, MercurialScri
         base_url = "http://commondatastorage.googleapis.com/chromium-browser-snapshots"
 
         # note: temporarily use a specified chromium revision number to download; however
         # in the future we will be using a fetch task to get a new chromium (Bug 1476372)
 
         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)
             self.chrome_path = os.path.join(self.chrome_dest, 'chrome-mac', 'Chromium.app',
                                             'Contents', 'MacOS', 'Chromium')
 
         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')
 
         else:
             # 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)
 
         self.info("installing google chrome - temporary install hack")
         self.info("chrome archive is: %s" % chrome_archive)
         self.info("chrome dest is: %s" % self.chrome_dest)
 
         if os.path.exists(self.chrome_path):
--- a/testing/raptor/raptor/raptor.py
+++ b/testing/raptor/raptor/raptor.py
@@ -362,17 +362,19 @@ class Raptor(object):
 
             # if running a pageload test on google chrome, add the cmd line options
             # to turn on the proxy and ignore security certificate errors
             # if using host localhost, 127.0.0.1.
             if self.config['app'] == "chrome" and test.get('playback', None) is not None:
                 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'])
                 if ' '.join(chrome_args) not in ' '.join(self.runner.cmdargs):
                     self.runner.cmdargs.extend(chrome_args)
 
             self.runner.start()
             proc = self.runner.process_handler