Bug 1208184 - Make download of tooltool.py customizable via a config setting. r=jlund DONTBUILD
authorHenrik Skupin <mail@hskupin.info>
Thu, 24 Sep 2015 22:34:53 +0200
changeset 264325 98398ef6d9872bf8b017a4fca0ca844441f16616
parent 264324 50126e0f1d13f50f7db56030c075e8ecb6e48b77
child 264326 11b3778d51e06b1467f6acc130d9f471534a2c37
push id29436
push usercbook@mozilla.com
push dateFri, 25 Sep 2015 12:39:56 +0000
treeherdermozilla-central@543e1b3a2588 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjlund
bugs1208184
milestone44.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 1208184 - Make download of tooltool.py customizable via a config setting. r=jlund DONTBUILD
testing/mozharness/configs/developer_config.py
testing/mozharness/mozharness/mozilla/tooltool.py
--- a/testing/mozharness/configs/developer_config.py
+++ b/testing/mozharness/configs/developer_config.py
@@ -34,16 +34,17 @@ config = {
     "find_links": ["http://pypi.pub.build.mozilla.org/pub"],
     "pip_index": False,
 
     # Talos related
     "python_webserver": True,
     "virtualenv_path": '%s/build/venv' % os.getcwd(),
 
     # Tooltool related
+    "download_tooltool": True,
     "tooltool_cache": os.path.join(LOCAL_WORKDIR, "builds/tooltool_cache"),
     "tooltool_cache_path": os.path.join(LOCAL_WORKDIR, "builds/tooltool_cache"),
 
     # VCS tools
     "hgtool.py": 'http://hg.mozilla.org/build/puppet/raw-file/faaf5abd792e/modules/packages/files/hgtool.py',
     "gittool.py": 'http://hg.mozilla.org/build/puppet/raw-file/faaf5abd792e/modules/packages/files/gittool.py',
 
     # Android related
--- a/testing/mozharness/mozharness/mozilla/tooltool.py
+++ b/testing/mozharness/mozharness/mozilla/tooltool.py
@@ -46,17 +46,17 @@ class TooltoolMixin(object):
         if os.path.exists(fn):
             return fn
 
     def tooltool_fetch(self, manifest,
                        output_dir=None, privileged=False, cache=None):
         """docstring for tooltool_fetch"""
         tooltool = self.query_exe('tooltool.py', return_type='list')
 
-        if self.config.get("developer_mode"):
+        if self.config.get("download_tooltool"):
             tooltool = [bin for bin in tooltool if os.path.exists(bin)]
             if tooltool:
                 cmd = [tooltool[0]]
             else:
                 cmd = [self._fetch_tooltool_py()]
         else:
             cmd = tooltool