Bug 1374946 - Only download what's needed for l10n repacks. r=Callek

As of bug 1373150, l10n repacks do not require a anything to compile, so they can stop downloading most toolchains from tooltool. However some tools are still required, such as mozmake on Windows and DMG-related tools on cross OSX. --HG-- extra : rebase_source : f46e851c7941491530ce65490d0cfce4f9f02e35
2025-03-04 07:40:42 +00:00 · 2017-06-21 16:36:23 +09:00 · 2017-06-21 16:36:23 +09:00 · dd3660441c
commit dd3660441c
parent c1a1beca7f
13 changed files with 25 additions and 56 deletions
--- a/browser/config/tooltool-manifests/macosx64/cross-l10n.manifest
+++ b/browser/config/tooltool-manifests/macosx64/cross-l10n.manifest
@ -0,0 +1,19 @@
+[
+  {
+    "version": "https://github.com/mozilla/libdmg-hfsplus rev ba04b00435a0853f1499d751617177828ee8ec00",
+    "size": 57060,
+    "visibility": "public",
+    "digest": "0c96f0d3ace71c4110abec6f7ead013600b0a73c89465d840276090d849279e555d977fb2aa6bbabb7891d7191fc8cc8a4e8242be888114be52346b77a512fcc",
+    "algorithm": "sha512",
+    "unpack": true,
+    "filename": "dmg.tar.xz"
+  },
+  {
+    "size": 281576,
+    "visibility": "public",
+    "digest": "71616564533d138fb12f08e761c2638d054814fdf9c9439638ec57b201e100445c364d73d8d7a4f0e3b784898d5fe6264e8242863fc5ac40163f1791468bbc46",
+    "algorithm": "sha512",
+    "filename": "hfsplus-tools.tar.xz",
+    "unpack": true
+  }
+]
--- a/testing/mozharness/configs/single_locale/linux.py
+++ b/testing/mozharness/configs/single_locale/linux.py
@ -14,8 +14,6 @@ config = {
        "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
        "L10NBASEDIR": "../../l10n",
        "MOZ_MAKE_COMPLETE_MAR": "1",
-        'TOOLTOOL_CACHE': '/builds/tooltool_cache',
-        'TOOLTOOL_HOME': '/builds',
        'EN_US_PACKAGE_NAME': 'target.tar.bz2',
    },
    "ssh_key_dir": "/home/mock_mozilla/.ssh",
@ -24,11 +22,6 @@ config = {
    "js_src_dir": "js/src",
    "vcs_share_base": "/builds/hg-shared",

-    # tooltool
-    'tooltool_url': 'https://api.pub.build.mozilla.org/tooltool/',
-    'tooltool_script': ["/builds/tooltool.py"],
-    'tooltool_bootstrap': "setup.sh",
-    'tooltool_manifest_src': 'browser/config/tooltool-manifests/linux32/releng.manifest',
    # balrog credential file:
    'balrog_credentials_file': 'oauth.txt',

@ -118,7 +111,6 @@ config = {
        ('/home/cltbld/.boto', '/builds/.boto'),
        ('/builds/gapi.data', '/builds/gapi.data'),
        ('/builds/relengapi.tok', '/builds/relengapi.tok'),
-        ('/tools/tooltool.py', '/builds/tooltool.py'),
        ('/usr/local/lib/hgext', '/usr/local/lib/hgext'),
    ],
 }
--- a/testing/mozharness/configs/single_locale/linux64.py
+++ b/testing/mozharness/configs/single_locale/linux64.py
@ -14,8 +14,6 @@ config = {
        "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
        "L10NBASEDIR": "../../l10n",
        "MOZ_MAKE_COMPLETE_MAR": "1",
-        'TOOLTOOL_CACHE': '/builds/tooltool_cache',
-        'TOOLTOOL_HOME': '/builds',
        'EN_US_PACKAGE_NAME': 'target.tar.bz2',
    },
    "ssh_key_dir": "/home/mock_mozilla/.ssh",
@ -24,11 +22,6 @@ config = {
    "js_src_dir": "js/src",
    "vcs_share_base": "/builds/hg-shared",

-    # tooltool
-    'tooltool_url': 'https://api.pub.build.mozilla.org/tooltool/',
-    'tooltool_script': ["/builds/tooltool.py"],
-    'tooltool_bootstrap': "setup.sh",
-    'tooltool_manifest_src': 'browser/config/tooltool-manifests/linux64/releng.manifest',
    # balrog credential file:
    'balrog_credentials_file': 'oauth.txt',

@ -98,7 +91,6 @@ config = {
        ('/home/cltbld/.boto', '/builds/.boto'),
        ('/builds/gapi.data', '/builds/gapi.data'),
        ('/builds/relengapi.tok', '/builds/relengapi.tok'),
-        ('/tools/tooltool.py', '/builds/tooltool.py'),
        ('/usr/local/lib/hgext', '/usr/local/lib/hgext'),
    ],
 }
--- a/testing/mozharness/configs/single_locale/linux64_devedition.py
+++ b/testing/mozharness/configs/single_locale/linux64_devedition.py
@ -14,8 +14,6 @@ config = {
        "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
        "L10NBASEDIR": "../../l10n",
        "MOZ_MAKE_COMPLETE_MAR": "1",
-        'TOOLTOOL_CACHE': '/builds/tooltool_cache',
-        'TOOLTOOL_HOME': '/builds',
        'EN_US_PACKAGE_NAME': 'target.tar.bz2',
    },
    "ssh_key_dir": "/home/mock_mozilla/.ssh",
@ -24,11 +22,6 @@ config = {
    "js_src_dir": "js/src",
    "vcs_share_base": "/builds/hg-shared",

-    # tooltool
-    'tooltool_url': 'https://api.pub.build.mozilla.org/tooltool/',
-    'tooltool_script': ["/builds/tooltool.py"],
-    'tooltool_bootstrap': "setup.sh",
-    'tooltool_manifest_src': 'browser/config/tooltool-manifests/linux64/releng.manifest',
    # balrog credential file:
    'balrog_credentials_file': 'oauth.txt',

@ -98,7 +91,6 @@ config = {
        ('/home/cltbld/.boto', '/builds/.boto'),
        ('/builds/gapi.data', '/builds/gapi.data'),
        ('/builds/relengapi.tok', '/builds/relengapi.tok'),
-        ('/tools/tooltool.py', '/builds/tooltool.py'),
        ('/usr/local/lib/hgext', '/usr/local/lib/hgext'),
    ],
 }
--- a/testing/mozharness/configs/single_locale/linux_devedition.py
+++ b/testing/mozharness/configs/single_locale/linux_devedition.py
@ -14,8 +14,6 @@ config = {
        "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
        "L10NBASEDIR": "../../l10n",
        "MOZ_MAKE_COMPLETE_MAR": "1",
-        'TOOLTOOL_CACHE': '/builds/tooltool_cache',
-        'TOOLTOOL_HOME': '/builds',
        'EN_US_PACKAGE_NAME': 'target.tar.bz2',
    },
    "ssh_key_dir": "/home/mock_mozilla/.ssh",
@ -24,11 +22,6 @@ config = {
    "js_src_dir": "js/src",
    "vcs_share_base": "/builds/hg-shared",

-    # tooltool
-    'tooltool_url': 'https://api.pub.build.mozilla.org/tooltool/',
-    'tooltool_script': ["/builds/tooltool.py"],
-    'tooltool_bootstrap': "setup.sh",
-    'tooltool_manifest_src': 'browser/config/tooltool-manifests/linux32/releng.manifest',
    # balrog credential file:
    'balrog_credentials_file': 'oauth.txt',

@ -118,7 +111,6 @@ config = {
        ('/home/cltbld/.boto', '/builds/.boto'),
        ('/builds/gapi.data', '/builds/gapi.data'),
        ('/builds/relengapi.tok', '/builds/relengapi.tok'),
-        ('/tools/tooltool.py', '/builds/tooltool.py'),
        ('/usr/local/lib/hgext', '/usr/local/lib/hgext'),
    ],
 }
--- a/testing/mozharness/configs/single_locale/macosx64.py
+++ b/testing/mozharness/configs/single_locale/macosx64.py
@ -18,8 +18,6 @@ config = {
        "L10NBASEDIR": "../../l10n",
        "MOZ_MAKE_COMPLETE_MAR": "1",
        "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
-        'TOOLTOOL_CACHE': '/builds/tooltool_cache',
-        'TOOLTOOL_HOME': '/builds',
    },
    "ssh_key_dir": "~/.ssh",
    "log_name": "single_locale",
@ -31,11 +29,6 @@ config = {
        "MOZ_PKG_PLATFORM": "mac",
    },

-    # tooltool
-    'tooltool_url': 'https://api.pub.build.mozilla.org/tooltool/',
-    'tooltool_script': ["/builds/tooltool.py"],
-    'tooltool_bootstrap': "setup.sh",
-    'tooltool_manifest_src': 'browser/config/tooltool-manifests/macosx64/releng.manifest',
    # balrog credential file:
    'balrog_credentials_file': 'oauth.txt',

--- a/testing/mozharness/configs/single_locale/macosx64_devedition.py
+++ b/testing/mozharness/configs/single_locale/macosx64_devedition.py
@ -18,8 +18,6 @@ config = {
        "L10NBASEDIR": "../../l10n",
        "MOZ_MAKE_COMPLETE_MAR": "1",
        "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
-        'TOOLTOOL_CACHE': '/builds/tooltool_cache',
-        'TOOLTOOL_HOME': '/builds',
    },
    "ssh_key_dir": "~/.ssh",
    "log_name": "single_locale",
@ -31,11 +29,6 @@ config = {
        "MOZ_PKG_PLATFORM": "mac",
    },

-    # tooltool
-    'tooltool_url': 'https://api.pub.build.mozilla.org/tooltool/',
-    'tooltool_script': ["/builds/tooltool.py"],
-    'tooltool_bootstrap': "setup.sh",
-    'tooltool_manifest_src': 'browser/config/tooltool-manifests/macosx64/releng.manifest',
    # balrog credential file:
    'balrog_credentials_file': 'oauth.txt',

--- a/testing/mozharness/configs/single_locale/tc_macosx64.py
+++ b/testing/mozharness/configs/single_locale/tc_macosx64.py
@ -24,7 +24,7 @@ config = {
    },

    "tooltool_url": 'http://relengapi/tooltool/',
-    'tooltool_manifest_src': "browser/config/tooltool-manifests/macosx64/cross-releng.manifest",
+    'tooltool_manifest_src': "browser/config/tooltool-manifests/macosx64/cross-l10n.manifest",
    "mozilla_dir": "src/",
    "simple_name_move": True,
 }
--- a/testing/mozharness/configs/single_locale/win32.py
+++ b/testing/mozharness/configs/single_locale/win32.py
@ -29,8 +29,7 @@ config = {
    'tooltool_url': 'https://api.pub.build.mozilla.org/tooltool/',
    'tooltool_script': [sys.executable,
                        'C:/mozilla-build/tooltool.py'],
-    'tooltool_bootstrap': "setup.sh",
-    'tooltool_manifest_src': 'browser/config/tooltool-manifests/win32/releng.manifest',
+    'tooltool_manifest_src': 'browser/config/tooltool-manifests/win32/l10n.manifest',
    # balrog credential file:
    'balrog_credentials_file': 'oauth.txt',

--- a/testing/mozharness/configs/single_locale/win32_devedition.py
+++ b/testing/mozharness/configs/single_locale/win32_devedition.py
@ -29,8 +29,7 @@ config = {
    'tooltool_url': 'https://api.pub.build.mozilla.org/tooltool/',
    'tooltool_script': [sys.executable,
                        'C:/mozilla-build/tooltool.py'],
-    'tooltool_bootstrap': "setup.sh",
-    'tooltool_manifest_src': 'browser/config/tooltool-manifests/win32/releng.manifest',
+    'tooltool_manifest_src': 'browser/config/tooltool-manifests/win32/l10n.manifest',
    # balrog credential file:
    'balrog_credentials_file': 'oauth.txt',

--- a/testing/mozharness/configs/single_locale/win64.py
+++ b/testing/mozharness/configs/single_locale/win64.py
@ -29,8 +29,7 @@ config = {
    'tooltool_url': 'https://api.pub.build.mozilla.org/tooltool/',
    'tooltool_script': [sys.executable,
                        'C:/mozilla-build/tooltool.py'],
-    'tooltool_bootstrap': "setup.sh",
-    'tooltool_manifest_src': 'browser/config/tooltool-manifests/win64/releng.manifest',
+    'tooltool_manifest_src': 'browser/config/tooltool-manifests/win64/l10n.manifest',
    # balrog credential file:
    'balrog_credentials_file': 'oauth.txt',

--- a/testing/mozharness/configs/single_locale/win64_devedition.py
+++ b/testing/mozharness/configs/single_locale/win64_devedition.py
@ -29,8 +29,7 @@ config = {
    'tooltool_url': 'https://api.pub.build.mozilla.org/tooltool/',
    'tooltool_script': [sys.executable,
                        'C:/mozilla-build/tooltool.py'],
-    'tooltool_bootstrap': "setup.sh",
-    'tooltool_manifest_src': 'browser/config/tooltool-manifests/win64/releng.manifest',
+    'tooltool_manifest_src': 'browser/config/tooltool-manifests/win64/l10n.manifest',
    # balrog credential file:
    'balrog_credentials_file': 'oauth.txt',

--- a/testing/mozharness/scripts/desktop_l10n.py
+++ b/testing/mozharness/scripts/desktop_l10n.py
@ -1044,7 +1044,7 @@ class DesktopSingleLocale(LocalesMixin, ReleaseMixin, MockMixin, BuildbotMixin,
        if not manifest_src:
            manifest_src = config.get('tooltool_manifest_src')
        if not manifest_src:
-            return self.warning(ERROR_MSGS['tooltool_manifest_undetermined'])
+            return
        tooltool_manifest_path = os.path.join(dirs['abs_mozilla_dir'],
                                              manifest_src)
        python = sys.executable