Bug 1356683 - Use new tooltool wrapper in AWSY jobs. r?chmanchester draft
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 12 Apr 2017 18:01:46 +0900
changeset 574596 b307d3abd5881d275f466bc6393dbaa25279afbd
parent 574595 167485f993dcbf314f369d2497c16a4f7c4f144c
child 627650 8af2e3162fb639aa164ca97ce1449316844f229c
push id57765
push userbmo:mh+mozilla@glandium.org
push dateTue, 09 May 2017 05:03:29 +0000
reviewerschmanchester
bugs1356683
milestone55.0a1
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',