Bug 1356683 - Use new tooltool wrapper in AWSY jobs. r=chmanchester
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 12 Apr 2017 18:01:46 +0900
changeset 357188 3441bd2b242a54f673794ab09d044d917cbf4650
parent 357187 70969dad9f5a50765f303ff634f83bac09d00487
child 357189 75ff904cfab108f2091bd5bc19fd37c3310f6bca
push id31783
push usercbook@mozilla.com
push dateTue, 09 May 2017 12:03:48 +0000
treeherdermozilla-central@b0ff0c5c0a35 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschmanchester
bugs1356683
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 1356683 - Use new tooltool wrapper in AWSY jobs. r=chmanchester
testing/awsy/mach_commands.py
--- a/testing/awsy/mach_commands.py
+++ b/testing/awsy/mach_commands.py
@@ -97,25 +97,20 @@ class MachCommands(MachCommandBase):
         runtime_testvars_file = open(runtime_testvars_path, 'wb')
         runtime_testvars_file.write(json.dumps(runtime_testvars, indent=2))
         runtime_testvars_file.close()
 
         manifest_file = os.path.join(awsy_source_dir,
                                      'tp5n-pageset.manifest')
         tooltool_args = {'args': [
             sys.executable,
-            os.path.join(self.topsrcdir,
-                         'python',
-                         'mozbuild',
-                         'mozbuild',
-                         'action',
-                         'tooltool.py'),
-            '--manifest=%s' % manifest_file,
-            '--cache-folder=%s' % os.path.join(self.topsrcdir, 'tooltool-cache'),
-            'fetch'
+            os.path.join(self.topsrcdir, 'mach'),
+            'artifact', 'toolchain', '-v',
+            '--tooltool-manifest=%s' % manifest_file,
+            '--cache-dir=%s' % os.path.join(self.topsrcdir, 'tooltool-cache'),
         ]}
         self.run_process(cwd=page_load_test_dir, **tooltool_args)
         tp5nzip = os.path.join(page_load_test_dir, 'tp5n.zip')
         tp5nmanifest = os.path.join(page_load_test_dir, 'tp5n', 'tp5n.manifest')
         if not os.path.exists(tp5nmanifest):
             unzip_args = {'args': [
                 'unzip',
                 '-q',