Bug 1520874: [mozharness] Remove mobile per-project l10n config; r=Callek
authorTom Prince <mozilla@hocat.ca>
Mon, 21 Jan 2019 22:53:12 +0000
changeset 514920 281df8f9dd9ead4e679ccd3cf777912438786c3b
parent 514919 df831d2de50654bb56fab8fd5314c02bdc00b41b
child 514921 b7fbc1847aa047c04626fe8b80460f018ec387ba
push id1953
push userffxbld-merge
push dateMon, 11 Mar 2019 12:10:20 +0000
treeherdermozilla-release@9c35dcbaa899 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersCallek
bugs1520874
milestone66.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 1520874: [mozharness] Remove mobile per-project l10n config; r=Callek Differential Revision: https://phabricator.services.mozilla.com/D15863
taskcluster/ci/l10n/kind.yml
taskcluster/ci/nightly-l10n/kind.yml
taskcluster/taskgraph/transforms/l10n.py
testing/mozharness/configs/single_locale/ash_android-api-16.py
testing/mozharness/configs/single_locale/autoland_android-api-16.py
testing/mozharness/configs/single_locale/jamun_android-api-16.py
testing/mozharness/configs/single_locale/linux.py
testing/mozharness/configs/single_locale/linux64.py
testing/mozharness/configs/single_locale/linux64_devedition.py
testing/mozharness/configs/single_locale/linux_devedition.py
testing/mozharness/configs/single_locale/macosx64.py
testing/mozharness/configs/single_locale/macosx64_devedition.py
testing/mozharness/configs/single_locale/maple_android-api-16.py
testing/mozharness/configs/single_locale/mozilla-aurora_android-api-16.py
testing/mozharness/configs/single_locale/mozilla-beta_android-api-16.py
testing/mozharness/configs/single_locale/mozilla-central_android-api-16.py
testing/mozharness/configs/single_locale/mozilla-inbound_android-api-16.py
testing/mozharness/configs/single_locale/mozilla-release_android-api-16.py
testing/mozharness/configs/single_locale/tc_android-api-16.py
testing/mozharness/configs/single_locale/try_android-api-16.py
testing/mozharness/configs/single_locale/win32.py
testing/mozharness/configs/single_locale/win32_devedition.py
testing/mozharness/configs/single_locale/win64.py
testing/mozharness/configs/single_locale/win64_devedition.py
testing/mozharness/scripts/mobile_l10n.py
--- a/taskcluster/ci/l10n/kind.yml
+++ b/taskcluster/ci/l10n/kind.yml
@@ -148,17 +148,16 @@ job-template:
                     - single_locale/win32.py
                     - single_locale/tc_common.py
                     - single_locale/tc_win32.py
                 win64:
                     - single_locale/win64.py
                     - 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
         actions:
             by-build-platform:
                 default: ['clone-locales', 'list-locales', 'setup', 'repack',
                           'summary']
                 android-api-16: ['get-secrets',
--- a/taskcluster/ci/nightly-l10n/kind.yml
+++ b/taskcluster/ci/nightly-l10n/kind.yml
@@ -208,17 +208,16 @@ job-template:
                     - taskcluster_nightly.py
                 win64-devedition-nightly:
                     - single_locale/win64_devedition.py
                     - single_locale/tc_common.py
                     - single_locale/tc_win64.py
                     - 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
         actions:
             by-build-platform:
                 default: ['clone-locales', 'list-locales', 'setup', 'repack',
                           'summary']
                 android-api-16-nightly: ['get-secrets',
--- a/taskcluster/taskgraph/transforms/l10n.py
+++ b/taskcluster/taskgraph/transforms/l10n.py
@@ -336,59 +336,35 @@ def chunk_locales(config, jobs):
             job['mozharness']['options'] = job['mozharness'].get('options', [])
             job['mozharness']['options'].extend([
                 'locale={}:{}'.format(locale, changeset)
                 for locale, changeset in sorted(locales_with_changesets.items())
             ])
             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)
 
 
 @transforms.add
 def stub_installer(config, jobs):
     for job in jobs:
         job.setdefault('attributes', {})
         job.setdefault('env', {})
         if job["attributes"].get('stub-installer'):
             job['env'].update({"USE_STUB_INSTALLER": "1"})
         yield job
 
 
 @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
 
 
 @transforms.add
 def make_job_description(config, jobs):
     for job in jobs:
deleted file mode 100644
--- a/testing/mozharness/configs/single_locale/ash_android-api-16.py
+++ /dev/null
@@ -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",
-}
deleted file mode 100644
--- a/testing/mozharness/configs/single_locale/autoland_android-api-16.py
+++ /dev/null
@@ -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",
-}
deleted file mode 100644
--- a/testing/mozharness/configs/single_locale/jamun_android-api-16.py
+++ /dev/null
@@ -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",
-}
--- a/testing/mozharness/configs/single_locale/linux.py
+++ b/testing/mozharness/configs/single_locale/linux.py
@@ -5,15 +5,14 @@ config = {
     "log_name": "single_locale",
     "objdir": "obj-firefox",
     "vcs_share_base": "/builds/hg-shared",
 
     # l10n
     "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",
     "mar": "mar",
     "mbsdiff": "mbsdiff",
 }
--- a/testing/mozharness/configs/single_locale/linux64.py
+++ b/testing/mozharness/configs/single_locale/linux64.py
@@ -4,15 +4,14 @@ config = {
     "mozconfig_variant": "l10n-mozconfig",
     "objdir": "obj-firefox",
     "vcs_share_base": "/builds/hg-shared",
 
     # l10n
     "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",
     "mar": "mar",
     "mbsdiff": "mbsdiff",
 }
--- a/testing/mozharness/configs/single_locale/linux64_devedition.py
+++ b/testing/mozharness/configs/single_locale/linux64_devedition.py
@@ -4,15 +4,14 @@ config = {
     "mozconfig_variant": "l10n-mozconfig-devedition",
     "objdir": "obj-firefox",
     "vcs_share_base": "/builds/hg-shared",
 
     # l10n
     "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",
     "mar": "mar",
     "mbsdiff": "mbsdiff",
 }
--- a/testing/mozharness/configs/single_locale/linux_devedition.py
+++ b/testing/mozharness/configs/single_locale/linux_devedition.py
@@ -4,15 +4,14 @@ config = {
     "mozconfig_variant": "l10n-mozconfig-devedition",
     "objdir": "obj-firefox",
     "vcs_share_base": "/builds/hg-shared",
 
     # l10n
     "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",
     "mar": "mar",
     "mbsdiff": "mbsdiff",
 }
--- a/testing/mozharness/configs/single_locale/macosx64.py
+++ b/testing/mozharness/configs/single_locale/macosx64.py
@@ -9,15 +9,14 @@ config = {
     "upload_env_extra": {
         "MOZ_PKG_PLATFORM": "mac",
     },
 
     # l10n
     "ignore_locales": ["en-US", "ja"],
     "l10n_dir": "l10n",
     "locales_dir": "browser/locales",
-    "hg_l10n_tag": "default",
 
     # MAR
     "local_mar_tool_dir": "dist/host/bin",
     "mar": "mar",
     "mbsdiff": "mbsdiff",
 }
--- a/testing/mozharness/configs/single_locale/macosx64_devedition.py
+++ b/testing/mozharness/configs/single_locale/macosx64_devedition.py
@@ -10,15 +10,14 @@ config = {
     "upload_env_extra": {
         "MOZ_PKG_PLATFORM": "mac",
     },
 
     # l10n
     "ignore_locales": ["en-US", "ja"],
     "l10n_dir": "l10n",
     "locales_dir": "browser/locales",
-    "hg_l10n_tag": "default",
 
     # MAR
     "local_mar_tool_dir": "dist/host/bin",
     "mar": "mar",
     "mbsdiff": "mbsdiff",
 }
deleted file mode 100644
--- a/testing/mozharness/configs/single_locale/maple_android-api-16.py
+++ /dev/null
@@ -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",
-}
deleted file mode 100644
--- a/testing/mozharness/configs/single_locale/mozilla-aurora_android-api-16.py
+++ /dev/null
@@ -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",
-}
deleted file mode 100644
--- a/testing/mozharness/configs/single_locale/mozilla-beta_android-api-16.py
+++ /dev/null
@@ -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,
-    },
-}
deleted file mode 100644
--- a/testing/mozharness/configs/single_locale/mozilla-central_android-api-16.py
+++ /dev/null
@@ -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",
-}
deleted file mode 100644
--- a/testing/mozharness/configs/single_locale/mozilla-inbound_android-api-16.py
+++ /dev/null
@@ -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",
-}
deleted file mode 100644
--- a/testing/mozharness/configs/single_locale/mozilla-release_android-api-16.py
+++ /dev/null
@@ -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,
-    },
-}
--- a/testing/mozharness/configs/single_locale/tc_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/tc_android-api-16.py
@@ -1,9 +1,20 @@
 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",
         "output_dir": "%(abs_work_dir)s/src",
     },
     "tooltool_servers": ['http://relengapi/tooltool/'],
 
     "upload_env": {
deleted file mode 100644
--- a/testing/mozharness/configs/single_locale/try_android-api-16.py
+++ /dev/null
@@ -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",
-}
--- a/testing/mozharness/configs/single_locale/win32.py
+++ b/testing/mozharness/configs/single_locale/win32.py
@@ -9,17 +9,16 @@ config = {
     # tooltool
     'tooltool_url': 'https://tooltool.mozilla-releng.net/',
     'tooltool_manifest_src': 'browser/config/tooltool-manifests/win32/l10n.manifest',
 
     # l10n
     "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",
     "mar": "mar.exe",
     "mbsdiff": "mbsdiff.exe",
 
     # use mozmake?
     "enable_mozmake": True,
--- a/testing/mozharness/configs/single_locale/win32_devedition.py
+++ b/testing/mozharness/configs/single_locale/win32_devedition.py
@@ -8,17 +8,16 @@ config = {
     # tooltool
     'tooltool_url': 'https://tooltool.mozilla-releng.net/',
     'tooltool_manifest_src': 'browser/config/tooltool-manifests/win32/l10n.manifest',
 
     # l10n
     "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",
     "mar": "mar.exe",
     "mbsdiff": "mbsdiff.exe",
 
     # use mozmake?
     "enable_mozmake": True,
--- a/testing/mozharness/configs/single_locale/win64.py
+++ b/testing/mozharness/configs/single_locale/win64.py
@@ -8,17 +8,16 @@ config = {
     # tooltool
     'tooltool_url': 'https://tooltool.mozilla-releng.net/',
     'tooltool_manifest_src': 'browser/config/tooltool-manifests/win64/l10n.manifest',
 
     # l10n
     "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",
     "mar": "mar.exe",
     "mbsdiff": "mbsdiff.exe",
 
     # use mozmake?
     "enable_mozmake": True,
--- a/testing/mozharness/configs/single_locale/win64_devedition.py
+++ b/testing/mozharness/configs/single_locale/win64_devedition.py
@@ -8,17 +8,16 @@ config = {
     # tooltool
     'tooltool_url': 'https://tooltool.mozilla-releng.net/',
     'tooltool_manifest_src': 'browser/config/tooltool-manifests/win64/l10n.manifest',
 
     # l10n
     "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",
     "mar": "mar.exe",
     "mbsdiff": "mbsdiff.exe",
 
     # use mozmake?
     "enable_mozmake": True,
--- a/testing/mozharness/scripts/mobile_l10n.py
+++ b/testing/mozharness/scripts/mobile_l10n.py
@@ -69,16 +69,17 @@ class MobileSingleLocale(LocalesMixin, T
                 "list-locales",
                 "setup",
                 "repack",
                 "upload-repacks",
                 "summary",
             ],
             'config': {
                 "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
+                "log_name": "single_locale",
             },
         }
         LocalesMixin.__init__(self)
         MercurialScript.__init__(
             self,
             config_options=self.config_options,
             require_config_file=require_config_file,
             **buildscript_kwargs