Bug 1520874: [mozharness] Remove mobile per-project l10n config; r=Callek

Differential Revision: https://phabricator.services.mozilla.com/D15863

--HG--
extra : moz-landing-system : lando

taskcluster/ci/l10n/kind.yml

@@ -153,7 +153,6 @@ job-template:
                     - single_locale/tc_common.py
                     - single_locale/tc_win64.py
                 android-api-16:
-                    - single_locale/{project}_android-api-16.py
                     - single_locale/tc_common.py
                     - single_locale/tc_android-api-16.py
         # no default, so we fail on new entries

taskcluster/ci/nightly-l10n/kind.yml

@@ -213,7 +213,6 @@ job-template:
                     - taskcluster_nightly.py
                 android-api-16-nightly:
                     - taskcluster_nightly.py
-                    - single_locale/{project}_android-api-16.py
                     - single_locale/tc_common.py
                     - single_locale/tc_android-api-16.py
         # no default, so we fail on new entries

taskcluster/taskgraph/transforms/l10n.py

@@ -341,31 +341,6 @@ def chunk_locales(config, jobs):
             yield job
 
 
-@transforms.add
-def mh_config_replace_project(config, jobs):
-    """ Replaces {project} in mh config entries with the current project """
-    for job in jobs:
-        job['mozharness'].setdefault('extra-config', {})['branch'] = config.params['project']
-        # XXXCallek This is a bad pattern but exists to satisfy ease-of-porting for buildbot
-        job['mozharness']['config'] = map(
-            lambda x: x.format(project=config.params['project']),
-            job['mozharness']['config']
-            )
-        yield job
-
-
-@transforms.add
-def mh_options_replace_project(config, jobs):
-    """ Replaces {project} in mh option entries with the current project """
-    # XXXCallek This is a bad pattern but exists to satisfy ease-of-porting for buildbot
-    for job in jobs:
-        job['mozharness']['options'] = map(
-            lambda x: x.format(project=config.params['project']),
-            job['mozharness']['options']
-            )
-        yield job
-
-
 transforms.add_validate(l10n_description_schema)
 
 
@@ -380,10 +355,11 @@ def stub_installer(config, jobs):
 
 
 @transforms.add
-def update_channel(config, jobs):
+def set_extra_config(config, jobs):
     for job in jobs:
+        job['mozharness'].setdefault('extra-config', {})['branch'] = config.params['project']
         if 'update-channel' in job['attributes']:
-            job['mozharness'].setdefault('extra-config', {})['update_channel'] = (
+            job['mozharness']['extra-config']['update_channel'] = (
                 job['attributes']['update-channel']
             )
         yield job

testing/mozharness/configs/single_locale/ash_android-api-16.py

@@ -1,31 +0,0 @@
-import os
-
-BRANCH = "ash"
-MOZILLA_DIR = BRANCH
-OBJDIR = "obj-firefox"
-HG_SHARE_BASE_DIR = "/builds/hg-shared"
-
-config = {
-    "branch": BRANCH,
-    "log_name": "single_locale",
-    "objdir": OBJDIR,
-    "locales_dir": "mobile/android/locales",
-    "ignore_locales": ["en-US"],
-    "tooltool_config": {
-        "manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
-        "output_dir": "%(abs_work_dir)s/" + MOZILLA_DIR,
-    },
-    "hg_l10n_tag": "default",
-    'vcs_share_base': HG_SHARE_BASE_DIR,
-
-    "l10n_dir": "l10n-central",
-    "repack_env": {
-        # so ugly, bug 951238
-        "LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
-        "MOZ_OBJDIR": OBJDIR,
-        "EN_US_BINARY_URL": os.environ['EN_US_BINARY_URL'],
-    },
-
-    # Balrog
-    "build_target": "Android_arm-eabi-gcc3",
-}

testing/mozharness/configs/single_locale/autoland_android-api-16.py

@@ -1,31 +0,0 @@
-import os
-
-BRANCH = "autoland"
-MOZILLA_DIR = BRANCH
-OBJDIR = "obj-firefox"
-HG_SHARE_BASE_DIR = "/builds/hg-shared"
-
-config = {
-    "branch": BRANCH,
-    "log_name": "single_locale",
-    "objdir": OBJDIR,
-    "locales_dir": "mobile/android/locales",
-    "ignore_locales": ["en-US"],
-    "tooltool_config": {
-        "manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
-        "output_dir": "%(abs_work_dir)s/" + MOZILLA_DIR,
-    },
-    "hg_l10n_tag": "default",
-    'vcs_share_base': HG_SHARE_BASE_DIR,
-
-    "l10n_dir": "l10n-central",
-    "repack_env": {
-        # so ugly, bug 951238
-        "LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
-        "MOZ_OBJDIR": OBJDIR,
-        "EN_US_BINARY_URL": os.environ["EN_US_BINARY_URL"],
-    },
-
-    # Balrog
-    "build_target": "Android_arm-eabi-gcc3",
-}

testing/mozharness/configs/single_locale/jamun_android-api-16.py

@@ -1,29 +0,0 @@
-import os
-
-BRANCH = "jamun"
-MOZILLA_DIR = BRANCH
-
-config = {
-    "branch": BRANCH,
-    "log_name": "single_locale",
-    "objdir": "obj-firefox",
-    "locales_dir": "mobile/android/locales",
-    "ignore_locales": ["en-US"],
-    "tooltool_config": {
-        "manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
-        "output_dir": "%(abs_work_dir)s/" + MOZILLA_DIR,
-    },
-    "hg_l10n_tag": "default",
-    'vcs_share_base': "/builds/hg-shared",
-
-    "l10n_dir": "mozilla-beta",
-    "repack_env": {
-        # so ugly, bug 951238
-        "LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
-        "MOZ_OBJDIR": "obj-firefox",
-        "EN_US_BINARY_URL": os.environ["EN_US_BINARY_URL"],
-    },
-
-    # Balrog
-    "build_target": "Android_arm-eabi-gcc3",
-}

testing/mozharness/configs/single_locale/linux.py

@@ -10,7 +10,6 @@ config = {
     "ignore_locales": ["en-US", "ja-JP-mac"],
     "l10n_dir": "l10n",
     "locales_dir": "browser/locales",
-    "hg_l10n_tag": "default",
 
     # MAR
     "local_mar_tool_dir": "dist/host/bin",

testing/mozharness/configs/single_locale/linux64.py

@@ -9,7 +9,6 @@ config = {
     "ignore_locales": ["en-US", "ja-JP-mac"],
     "l10n_dir": "l10n",
     "locales_dir": "browser/locales",
-    "hg_l10n_tag": "default",
 
     # MAR
     "local_mar_tool_dir": "dist/host/bin",

testing/mozharness/configs/single_locale/linux64_devedition.py

@@ -9,7 +9,6 @@ config = {
     "ignore_locales": ["en-US", "ja-JP-mac"],
     "l10n_dir": "l10n",
     "locales_dir": "browser/locales",
-    "hg_l10n_tag": "default",
 
     # MAR
     "local_mar_tool_dir": "dist/host/bin",

testing/mozharness/configs/single_locale/linux_devedition.py

@@ -9,7 +9,6 @@ config = {
     "ignore_locales": ["en-US", "ja-JP-mac"],
     "l10n_dir": "l10n",
     "locales_dir": "browser/locales",
-    "hg_l10n_tag": "default",
 
     # MAR
     "local_mar_tool_dir": "dist/host/bin",

testing/mozharness/configs/single_locale/macosx64.py

@@ -14,7 +14,6 @@ config = {
     "ignore_locales": ["en-US", "ja"],
     "l10n_dir": "l10n",
     "locales_dir": "browser/locales",
-    "hg_l10n_tag": "default",
 
     # MAR
     "local_mar_tool_dir": "dist/host/bin",

testing/mozharness/configs/single_locale/macosx64_devedition.py

@@ -15,7 +15,6 @@ config = {
     "ignore_locales": ["en-US", "ja"],
     "l10n_dir": "l10n",
     "locales_dir": "browser/locales",
-    "hg_l10n_tag": "default",
 
     # MAR
     "local_mar_tool_dir": "dist/host/bin",

testing/mozharness/configs/single_locale/maple_android-api-16.py

@@ -1,29 +0,0 @@
-import os
-
-BRANCH = "maple"
-MOZILLA_DIR = BRANCH
-
-config = {
-    "branch": BRANCH,
-    "log_name": "single_locale",
-    "objdir": "obj-firefox",
-    "locales_dir": "mobile/android/locales",
-    "ignore_locales": ["en-US"],
-    "tooltool_config": {
-        "manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
-        "output_dir": "%(abs_work_dir)s/" + MOZILLA_DIR,
-    },
-    "hg_l10n_tag": "default",
-    'vcs_share_base': "/builds/hg-shared",
-
-    "l10n_dir": "l10n-central",
-    "repack_env": {
-        # so ugly, bug 951238
-        "LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
-        "MOZ_OBJDIR": "obj-firefox",
-        "EN_US_BINARY_URL": os.environ["EN_US_BINARY_URL"],
-    },
-
-    # Balrog
-    "build_target": "Android_arm-eabi-gcc3",
-}

testing/mozharness/configs/single_locale/mozilla-aurora_android-api-16.py

@@ -1,31 +0,0 @@
-import os
-
-BRANCH = "mozilla-aurora"
-MOZILLA_DIR = BRANCH
-OBJDIR = "obj-firefox"
-HG_SHARE_BASE_DIR = "/builds/hg-shared"
-
-config = {
-    "branch": BRANCH,
-    "log_name": "single_locale",
-    "objdir": OBJDIR,
-    "locales_dir": "mobile/android/locales",
-    "ignore_locales": ["en-US"],
-    "tooltool_config": {
-        "manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
-        "output_dir": "%(abs_work_dir)s/" + MOZILLA_DIR,
-    },
-    "hg_l10n_tag": "default",
-    'vcs_share_base': HG_SHARE_BASE_DIR,
-
-    "l10n_dir": MOZILLA_DIR,
-    "repack_env": {
-        # so ugly, bug 951238
-        "LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
-        "MOZ_OBJDIR": OBJDIR,
-        "EN_US_BINARY_URL": os.environ["EN_US_BINARY_URL"],
-    },
-
-    # Balrog
-    "build_target": "Android_arm-eabi-gcc3",
-}

testing/mozharness/configs/single_locale/mozilla-beta_android-api-16.py

@@ -1,29 +0,0 @@
-import os
-BRANCH = "mozilla-beta"
-MOZILLA_DIR = BRANCH
-OBJDIR = "obj-firefox"
-EN_US_BINARY_URL = None
-HG_SHARE_BASE_DIR = "/builds/hg-shared"
-
-config = {
-    "branch": BRANCH,
-    "log_name": "single_locale",
-    "objdir": OBJDIR,
-    "locales_dir": "mobile/android/locales",
-    "ignore_locales": ["en-US"],
-    "build_target": "Android_arm-eabi-gcc3",
-    "tooltool_config": {
-        "manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
-        "output_dir": "%(abs_work_dir)s/" + MOZILLA_DIR,
-    },
-    "hg_l10n_tag": "default",
-    'vcs_share_base': HG_SHARE_BASE_DIR,
-    "l10n_dir": "l10n-central",
-
-    "repack_env": {
-        # so ugly, bug 951238
-        "LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
-        "EN_US_BINARY_URL": os.environ["EN_US_BINARY_URL"],
-        "MOZ_OBJDIR": OBJDIR,
-    },
-}

testing/mozharness/configs/single_locale/mozilla-central_android-api-16.py

@@ -1,31 +0,0 @@
-import os
-
-BRANCH = "mozilla-central"
-MOZILLA_DIR = BRANCH
-OBJDIR = "obj-firefox"
-HG_SHARE_BASE_DIR = "/builds/hg-shared"
-
-config = {
-    "branch": BRANCH,
-    "log_name": "single_locale",
-    "objdir": OBJDIR,
-    "locales_dir": "mobile/android/locales",
-    "ignore_locales": ["en-US"],
-    "tooltool_config": {
-        "manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
-        "output_dir": "%(abs_work_dir)s/" + MOZILLA_DIR,
-    },
-    "hg_l10n_tag": "default",
-    'vcs_share_base': HG_SHARE_BASE_DIR,
-
-    "l10n_dir": "l10n-central",
-    "repack_env": {
-        # so ugly, bug 951238
-        "LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
-        "MOZ_OBJDIR": OBJDIR,
-        "EN_US_BINARY_URL": os.environ["EN_US_BINARY_URL"],
-    },
-
-    # Balrog
-    "build_target": "Android_arm-eabi-gcc3",
-}

testing/mozharness/configs/single_locale/mozilla-inbound_android-api-16.py

@@ -1,31 +0,0 @@
-import os
-
-BRANCH = "mozilla-inbound"
-MOZILLA_DIR = BRANCH
-OBJDIR = "obj-firefox"
-HG_SHARE_BASE_DIR = "/builds/hg-shared"
-
-config = {
-    "branch": BRANCH,
-    "log_name": "single_locale",
-    "objdir": OBJDIR,
-    "locales_dir": "mobile/android/locales",
-    "ignore_locales": ["en-US"],
-    "tooltool_config": {
-        "manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
-        "output_dir": "%(abs_work_dir)s/" + MOZILLA_DIR,
-    },
-    "hg_l10n_tag": "default",
-    'vcs_share_base': HG_SHARE_BASE_DIR,
-
-    "l10n_dir": "l10n-central",
-    "repack_env": {
-        # so ugly, bug 951238
-        "LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
-        "MOZ_OBJDIR": OBJDIR,
-        "EN_US_BINARY_URL": os.environ["EN_US_BINARY_URL"],
-    },
-
-    # Balrog
-    "build_target": "Android_arm-eabi-gcc3",
-}

testing/mozharness/configs/single_locale/mozilla-release_android-api-16.py

@@ -1,28 +0,0 @@
-import os
-BRANCH = "mozilla-release"
-MOZILLA_DIR = BRANCH
-OBJDIR = "obj-firefox"
-HG_SHARE_BASE_DIR = "/builds/hg-shared"
-
-config = {
-    "branch": BRANCH,
-    "log_name": "single_locale",
-    "objdir": OBJDIR,
-    "locales_dir": "mobile/android/locales",
-    "ignore_locales": ["en-US"],
-    "build_target": "Android_arm-eabi-gcc3",
-    "tooltool_config": {
-        "manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
-        "output_dir": "%(abs_work_dir)s/" + MOZILLA_DIR,
-    },
-    "hg_l10n_tag": "default",
-    'vcs_share_base': HG_SHARE_BASE_DIR,
-    "l10n_dir": "l10n-central",
-
-    "repack_env": {
-        # so ugly, bug 951238
-        "LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
-        "EN_US_BINARY_URL": os.environ["EN_US_BINARY_URL"],
-        "MOZ_OBJDIR": OBJDIR,
-    },
-}

testing/mozharness/configs/single_locale/tc_android-api-16.py

@@ -1,4 +1,15 @@
 config = {
+    "l10n_dir": "l10n-central",
+    "locales_dir": "mobile/android/locales",
+    "ignore_locales": ["en-US"],
+
+    "objdir": "obj-firefox",
+    "repack_env": {
+        "MOZ_OBJDIR": "obj-firefox",
+    },
+
+    'vcs_share_base': "/builds/hg-shared",
+
     "mozconfig": "src/mobile/android/config/mozconfigs/android-api-16/l10n-nightly",
     "tooltool_config": {
         "manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",

testing/mozharness/configs/single_locale/try_android-api-16.py

@@ -1,29 +0,0 @@
-import os
-
-BRANCH = "try"
-MOZILLA_DIR = BRANCH
-
-config = {
-    "branch": "try",
-    "log_name": "single_locale",
-    "objdir": "obj-firefox",
-    "locales_dir": "mobile/android/locales",
-    "ignore_locales": ["en-US"],
-    "tooltool_config": {
-        "manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
-        "output_dir": "%(abs_work_dir)s/" + MOZILLA_DIR,
-    },
-    "hg_l10n_tag": "default",
-    'vcs_share_base': "/builds/hg-shared",
-
-    "l10n_dir": "l10n-central",
-    "repack_env": {
-        # so ugly, bug 951238
-        "LD_LIBRARY_PATH": "/lib:/tools/gcc-4.7.2-0moz1/lib:/tools/gcc-4.7.2-0moz1/lib64",
-        "MOZ_OBJDIR": "obj-firefox",
-        "EN_US_BINARY_URL": os.environ["EN_US_BINARY_URL"],
-    },
-
-    # Balrog
-    "build_target": "Android_arm-eabi-gcc3",
-}

testing/mozharness/configs/single_locale/win32.py

@@ -14,7 +14,6 @@ config = {
     "ignore_locales": ["en-US", "ja-JP-mac"],
     "l10n_dir": "l10n",
     "locales_dir": "browser/locales",
-    "hg_l10n_tag": "default",
 
     # MAR
     "local_mar_tool_dir": "dist\\host\\bin",

testing/mozharness/configs/single_locale/win32_devedition.py

@@ -13,7 +13,6 @@ config = {
     "ignore_locales": ["en-US", "ja-JP-mac"],
     "l10n_dir": "l10n",
     "locales_dir": "browser/locales",
-    "hg_l10n_tag": "default",
 
     # MAR
     "local_mar_tool_dir": "dist\\host\\bin",

testing/mozharness/configs/single_locale/win64.py

@@ -13,7 +13,6 @@ config = {
     "ignore_locales": ["en-US", "ja-JP-mac"],
     "l10n_dir": "l10n",
     "locales_dir": "browser/locales",
-    "hg_l10n_tag": "default",
 
     # MAR
     "local_mar_tool_dir": "dist\\host\\bin",

testing/mozharness/configs/single_locale/win64_devedition.py

@@ -13,7 +13,6 @@ config = {
     "ignore_locales": ["en-US", "ja-JP-mac"],
     "l10n_dir": "l10n",
     "locales_dir": "browser/locales",
-    "hg_l10n_tag": "default",
 
     # MAR
     "local_mar_tool_dir": "dist\\host\\bin",

testing/mozharness/scripts/mobile_l10n.py

@@ -74,6 +74,7 @@ class MobileSingleLocale(LocalesMixin, TooltoolMixin, AutomationMixin,
             ],
             'config': {
                 "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
+                "log_name": "single_locale",
             },
         }
         LocalesMixin.__init__(self)