From 1672d0a0f9036be382f51e33d80f427df39ce6ef Mon Sep 17 00:00:00 2001 From: Tom Prince Date: Mon, 21 Jan 2019 22:53:12 +0000 Subject: [PATCH] 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 | 1 - taskcluster/ci/nightly-l10n/kind.yml | 1 - taskcluster/taskgraph/transforms/l10n.py | 30 ++---------------- .../single_locale/ash_android-api-16.py | 31 ------------------- .../single_locale/autoland_android-api-16.py | 31 ------------------- .../single_locale/jamun_android-api-16.py | 29 ----------------- .../mozharness/configs/single_locale/linux.py | 1 - .../configs/single_locale/linux64.py | 1 - .../single_locale/linux64_devedition.py | 1 - .../configs/single_locale/linux_devedition.py | 1 - .../configs/single_locale/macosx64.py | 1 - .../single_locale/macosx64_devedition.py | 1 - .../single_locale/maple_android-api-16.py | 29 ----------------- .../mozilla-aurora_android-api-16.py | 31 ------------------- .../mozilla-beta_android-api-16.py | 29 ----------------- .../mozilla-central_android-api-16.py | 31 ------------------- .../mozilla-inbound_android-api-16.py | 31 ------------------- .../mozilla-release_android-api-16.py | 28 ----------------- .../single_locale/tc_android-api-16.py | 11 +++++++ .../single_locale/try_android-api-16.py | 29 ----------------- .../mozharness/configs/single_locale/win32.py | 1 - .../configs/single_locale/win32_devedition.py | 1 - .../mozharness/configs/single_locale/win64.py | 1 - .../configs/single_locale/win64_devedition.py | 1 - testing/mozharness/scripts/mobile_l10n.py | 1 + 25 files changed, 15 insertions(+), 338 deletions(-) delete mode 100644 testing/mozharness/configs/single_locale/ash_android-api-16.py delete mode 100644 testing/mozharness/configs/single_locale/autoland_android-api-16.py delete mode 100644 testing/mozharness/configs/single_locale/jamun_android-api-16.py delete mode 100644 testing/mozharness/configs/single_locale/maple_android-api-16.py delete mode 100644 testing/mozharness/configs/single_locale/mozilla-aurora_android-api-16.py delete mode 100644 testing/mozharness/configs/single_locale/mozilla-beta_android-api-16.py delete mode 100644 testing/mozharness/configs/single_locale/mozilla-central_android-api-16.py delete mode 100644 testing/mozharness/configs/single_locale/mozilla-inbound_android-api-16.py delete mode 100644 testing/mozharness/configs/single_locale/mozilla-release_android-api-16.py delete mode 100644 testing/mozharness/configs/single_locale/try_android-api-16.py diff --git a/taskcluster/ci/l10n/kind.yml b/taskcluster/ci/l10n/kind.yml index d51ec1c59d34..bbf2d4194278 100644 --- a/taskcluster/ci/l10n/kind.yml +++ b/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 diff --git a/taskcluster/ci/nightly-l10n/kind.yml b/taskcluster/ci/nightly-l10n/kind.yml index 3a4eeddaf94d..eaae91798196 100644 --- a/taskcluster/ci/nightly-l10n/kind.yml +++ b/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 diff --git a/taskcluster/taskgraph/transforms/l10n.py b/taskcluster/taskgraph/transforms/l10n.py index 9baa06d97687..0356eeaa5a93 100644 --- a/taskcluster/taskgraph/transforms/l10n.py +++ b/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 diff --git a/testing/mozharness/configs/single_locale/ash_android-api-16.py b/testing/mozharness/configs/single_locale/ash_android-api-16.py deleted file mode 100644 index be557870e186..000000000000 --- 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", -} diff --git a/testing/mozharness/configs/single_locale/autoland_android-api-16.py b/testing/mozharness/configs/single_locale/autoland_android-api-16.py deleted file mode 100644 index 4364748c96ce..000000000000 --- 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", -} diff --git a/testing/mozharness/configs/single_locale/jamun_android-api-16.py b/testing/mozharness/configs/single_locale/jamun_android-api-16.py deleted file mode 100644 index 1397903a814e..000000000000 --- 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", -} diff --git a/testing/mozharness/configs/single_locale/linux.py b/testing/mozharness/configs/single_locale/linux.py index e7dda167b195..cddc7a8cb853 100644 --- a/testing/mozharness/configs/single_locale/linux.py +++ b/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", diff --git a/testing/mozharness/configs/single_locale/linux64.py b/testing/mozharness/configs/single_locale/linux64.py index 3f2d0d1596e4..acb7cbcda978 100644 --- a/testing/mozharness/configs/single_locale/linux64.py +++ b/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", diff --git a/testing/mozharness/configs/single_locale/linux64_devedition.py b/testing/mozharness/configs/single_locale/linux64_devedition.py index 704b220921ee..776dcc81e659 100644 --- a/testing/mozharness/configs/single_locale/linux64_devedition.py +++ b/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", diff --git a/testing/mozharness/configs/single_locale/linux_devedition.py b/testing/mozharness/configs/single_locale/linux_devedition.py index 90527e7b79b6..94e40bc756d8 100644 --- a/testing/mozharness/configs/single_locale/linux_devedition.py +++ b/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", diff --git a/testing/mozharness/configs/single_locale/macosx64.py b/testing/mozharness/configs/single_locale/macosx64.py index 3bf3a61d8754..25a1bec9e692 100644 --- a/testing/mozharness/configs/single_locale/macosx64.py +++ b/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", diff --git a/testing/mozharness/configs/single_locale/macosx64_devedition.py b/testing/mozharness/configs/single_locale/macosx64_devedition.py index a1241b339a86..21c20d81a7e2 100644 --- a/testing/mozharness/configs/single_locale/macosx64_devedition.py +++ b/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", diff --git a/testing/mozharness/configs/single_locale/maple_android-api-16.py b/testing/mozharness/configs/single_locale/maple_android-api-16.py deleted file mode 100644 index da7206c7a6d8..000000000000 --- 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", -} diff --git a/testing/mozharness/configs/single_locale/mozilla-aurora_android-api-16.py b/testing/mozharness/configs/single_locale/mozilla-aurora_android-api-16.py deleted file mode 100644 index f5c5e2e0e703..000000000000 --- 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", -} diff --git a/testing/mozharness/configs/single_locale/mozilla-beta_android-api-16.py b/testing/mozharness/configs/single_locale/mozilla-beta_android-api-16.py deleted file mode 100644 index fbb3d3cc7e4c..000000000000 --- 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, - }, -} diff --git a/testing/mozharness/configs/single_locale/mozilla-central_android-api-16.py b/testing/mozharness/configs/single_locale/mozilla-central_android-api-16.py deleted file mode 100644 index 6103458035b9..000000000000 --- 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", -} diff --git a/testing/mozharness/configs/single_locale/mozilla-inbound_android-api-16.py b/testing/mozharness/configs/single_locale/mozilla-inbound_android-api-16.py deleted file mode 100644 index cc1108809542..000000000000 --- 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", -} diff --git a/testing/mozharness/configs/single_locale/mozilla-release_android-api-16.py b/testing/mozharness/configs/single_locale/mozilla-release_android-api-16.py deleted file mode 100644 index 0f0daf2c460d..000000000000 --- 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, - }, -} diff --git a/testing/mozharness/configs/single_locale/tc_android-api-16.py b/testing/mozharness/configs/single_locale/tc_android-api-16.py index bd5541b35ec3..87dd94660332 100644 --- a/testing/mozharness/configs/single_locale/tc_android-api-16.py +++ b/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", diff --git a/testing/mozharness/configs/single_locale/try_android-api-16.py b/testing/mozharness/configs/single_locale/try_android-api-16.py deleted file mode 100644 index 2908498536aa..000000000000 --- 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", -} diff --git a/testing/mozharness/configs/single_locale/win32.py b/testing/mozharness/configs/single_locale/win32.py index 92ad8b19756f..e1505f5b0627 100644 --- a/testing/mozharness/configs/single_locale/win32.py +++ b/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", diff --git a/testing/mozharness/configs/single_locale/win32_devedition.py b/testing/mozharness/configs/single_locale/win32_devedition.py index 192f2b54d751..37eb04b140d4 100644 --- a/testing/mozharness/configs/single_locale/win32_devedition.py +++ b/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", diff --git a/testing/mozharness/configs/single_locale/win64.py b/testing/mozharness/configs/single_locale/win64.py index 92e9fc7f2894..243fd3ecbba0 100644 --- a/testing/mozharness/configs/single_locale/win64.py +++ b/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", diff --git a/testing/mozharness/configs/single_locale/win64_devedition.py b/testing/mozharness/configs/single_locale/win64_devedition.py index d99e317b8f64..ede670262805 100644 --- a/testing/mozharness/configs/single_locale/win64_devedition.py +++ b/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", diff --git a/testing/mozharness/scripts/mobile_l10n.py b/testing/mozharness/scripts/mobile_l10n.py index 18e66f07245c..3b44a03e1fab 100755 --- a/testing/mozharness/scripts/mobile_l10n.py +++ b/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)