Bug 1517738 - Have Raptor use the correct binary name when running on android in production; r=gbrown
authorRob Wood <rwood@mozilla.com>
Tue, 22 Jan 2019 19:56:58 +0000
changeset 514929 714ae096d76ebff59c487965500410568ac91008
parent 514928 ee28acf1382f6df640735c8d1cb66c3c80367153
child 514934 ce496fde2eddf168291d48576e7ef3a06e75896a
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)
reviewersgbrown
bugs1517738
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 1517738 - Have Raptor use the correct binary name when running on android in production; r=gbrown Differential Revision: https://phabricator.services.mozilla.com/D17251
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
@@ -332,16 +332,21 @@ class Raptor(TestingMixin, MercurialScri
         # binary path; if testing on firefox the binary path already came from mozharness/pro;
         # otherwise the binary path is forwarded from cmd line arg (raptor_cmd_line_args)
         kw_options['app'] = self.app
         if self.app == "firefox" or (self.app in["geckoview", "fennec"] and not self.run_local):
             binary_path = self.binary_path or self.config.get('binary_path')
             if not binary_path:
                 self.fatal("Raptor requires a path to the binary.")
             kw_options['binary'] = binary_path
+            if self.app in["geckoview", "fennec"]:
+                # in production ensure we have correct app name,
+                # i.e. fennec_aurora or fennec_release etc.
+                kw_options['binary'] = self.query_package_name()
+                self.info("set binary to %s instead of %s" % (kw_options['binary'], binary_path))
         else:  # running on google chrome
             if not self.run_local:
                 # when running locally we already set the chrome binary above in init; here
                 # in production we aready installed chrome, so set the binary path to our install
                 kw_options['binary'] = self.chrome_path
 
         # options overwritten from **kw
         if 'test' in self.config:
--- a/testing/raptor/raptor/raptor.py
+++ b/testing/raptor/raptor/raptor.py
@@ -309,24 +309,16 @@ class Raptor(object):
                                                 fail_if_running=False)
                 except Exception:
                     self.log.error("Exception launching %s" % self.config['binary'])
                     if self.config['power_test']:
                         finish_geckoview_power_test(self)
                     raise
             else:
                 # launch fennec
-
-                # when running locally the 'binary' is provided on the mach raptor-test cmd line,
-                # i.e. `org.mozilla.fennec_aurora` for fennec nightly
-                # in production the default `.fennec_aurora` comes form the tc config;
-                # if we're running in production but on beta that needs to be changed to `.fennec`
-                if not self.config['run_local'] and self.config['is_release_build']:
-                    self.config['binary'] = 'org.mozilla.fennec'
-
                 try:
                     # if fennec is already running, shut it down first
                     self.device.stop_application(self.config['binary'])
                     self.device.launch_fennec(self.config['binary'],
                                               extra_args=extra_args,
                                               url='about:blank',
                                               fail_if_running=False)
                 except Exception: