Bug 1364651 - Add back the hack invoking mach via bash to see if it makes the TC build machines happy again. r=pmoore
authorRyan VanderMeulen <ryanvm@gmail.com>
Fri, 02 Jun 2017 09:20:40 -0400
changeset 362020 54163bd59f7b
parent 362019 d5cd9b6d1a87
child 362021 bc72cc13c8f4
child 362031 95d2d23ff510
push id90978
push userryanvm@gmail.com
push dateFri, 02 Jun 2017 13:21:45 +0000
treeherdermozilla-inbound@54163bd59f7b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerspmoore
bugs1364651
milestone55.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 1364651 - Add back the hack invoking mach via bash to see if it makes the TC build machines happy again. r=pmoore
testing/mozharness/mozharness/mozilla/building/buildbase.py
--- a/testing/mozharness/mozharness/mozilla/building/buildbase.py
+++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py
@@ -1612,18 +1612,26 @@ or run without that action (ie: --no-{ac
         dirs = self.query_abs_dirs()
         buildprops = os.path.join(dirs['base_work_dir'], 'buildprops.json')
         # not finding buildprops is not an error outside of buildbot
         if os.path.exists(buildprops):
             self.copyfile(
                 buildprops,
                 os.path.join(dirs['abs_work_dir'], 'buildprops.json'))
 
+        if 'MOZILLABUILD' in os.environ:
+            mach = [
+                os.path.join(os.environ['MOZILLABUILD'], 'msys', 'bin', 'bash.exe'),
+                os.path.join(dirs['abs_src_dir'], 'mach')
+            ]
+        else:
+            mach = [sys.executable, 'mach']
+
         return_code = self.run_command_m(
-            command=[sys.executable, 'mach', '--log-no-times', 'build', '-v'],
+            command=mach + ['--log-no-times', 'build', '-v'],
             cwd=dirs['abs_src_dir'],
             env=env,
             output_timeout=self.config.get('max_build_output_timeout', 60 * 40)
         )
         if return_code:
             self.return_code = self.worst_level(
                 EXIT_STATUS_DICT[TBPL_FAILURE],  self.return_code,
                 AUTOMATION_EXIT_CODES[::-1]