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 563045 cabc0fedf86d2b4a6700ae2ece5d63cab6fa8169
parent 563044 0feb06c8cd6f3624eaeada12b2750d669b308809
child 563046 0943cb2f05bc58c43667643f03f4af3fc15d6eda
push id54195
push userbmo:mh+mozilla@glandium.org
push dateFri, 14 Apr 2017 21:59:19 +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
@@ -100,21 +100,20 @@ class MachCommands(MachCommandBase):
 
         if not kwargs['webRootDir']:
             # Populate the Awsy webroot if not specified by the user.
             manifest_file = os.path.join(self.topsrcdir,
                                          'testing',
                                          'awsy',
                                          'tp5n-pageset.manifest')
             tooltool_args = {"args": [
-                os.path.join(self.topsrcdir, "python/mozbuild/mozbuild/action/tooltool.py"),
-                "--manifest=%s" % manifest_file,
-                "--unpack",
-                "--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):
                 files = mozfile.extract_zip(tp5nzip, page_load_test_dir)