Bug 1522715 - Port
Bug 1520874: Simplify Mozharness l10n configs. rs=bustage-fix DONTBUILD
This simplifies the configuration for the l10n repackaging step.
Differential Revision:
https://phabricator.services.mozilla.com/D17585
deleted file mode 100644
--- a/mozharness/single_locale/comm-beta.py
+++ /dev/null
@@ -1,13 +0,0 @@
-import os
-config = {
- "app_name": "comm/mail",
- "nightly_build": True,
- "branch": "comm-beta",
- 'is_automation': True,
-
- "mar_tools_url": os.environ["MAR_TOOLS_URL"],
- "en_us_binary_url": os.environ["EN_US_BINARY_URL"],
- "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
-
- "update_channel": "beta",
-}
deleted file mode 100644
--- a/mozharness/single_locale/comm-central.py
+++ /dev/null
@@ -1,13 +0,0 @@
-import os
-config = {
- "app_name": "comm/mail",
- "nightly_build": False,
- "branch": "comm-central",
- 'is_automation': True,
-
- "mar_tools_url": os.environ["MAR_TOOLS_URL"],
- "en_us_binary_url": os.environ["EN_US_BINARY_URL"],
- "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
-
- "update_channel": "nightly",
-}
deleted file mode 100644
--- a/mozharness/single_locale/comm-esr60.py
+++ /dev/null
@@ -1,12 +0,0 @@
-import os
-config = {
- "app_name": "comm/mail",
- "nightly_build": True,
- "branch": "comm-esr60",
- 'is_automation': True,
-
- "mar_tools_url": os.environ["MAR_TOOLS_URL"],
- "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
-
- "update_channel": "release",
-}
--- a/mozharness/single_locale/thunderbird.py
+++ b/mozharness/single_locale/thunderbird.py
@@ -1,6 +1,11 @@
config = {
# Source path
'app_name': 'comm/mail',
+ 'mozconfig_variant': 'l10n-mozconfig',
+
+ # FIXME: See bug 1522715. -rjl
+ "objdir": "obj-firefox",
+ "l10n_dir": "l10n",
"locales_file": "src/comm/mail/locales/all-locales",
"locales_dir": "comm/mail/locales",
}
deleted file mode 100644
--- a/mozharness/single_locale/try-comm-central.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import os
-config = {
- "app_name": "comm/mail",
- "nightly_build": False,
- "branch": "try-comm-central",
- 'is_automation': True,
-
- "mar_tools_url": os.environ["MAR_TOOLS_URL"],
- "en_us_binary_url": os.environ["EN_US_BINARY_URL"],
- "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
-
- #FIXME
- "update_channel": "nightly",
-}
--- a/taskcluster/ci/nightly-l10n/kind.yml
+++ b/taskcluster/ci/nightly-l10n/kind.yml
@@ -69,69 +69,59 @@ job-template:
macosx64-nightly: osx-cross/opt
win32-nightly: windows2012-32/opt
win64-nightly: windows2012-64/opt
env:
by-build-platform:
linux.*: # linux64 and 32 get same treatment here
EN_US_PACKAGE_NAME: target.tar.bz2
EN_US_BINARY_URL:
- task-reference: https://queue.taskcluster.net/v1/task/<build-signing>/artifacts/public/build
- MAR_TOOLS_URL:
- task-reference: https://queue.taskcluster.net/v1/task/<build>/artifacts/public/build/host/bin
+ artifact-reference: <build-signing/{artifact_prefix}>
macosx64-nightly:
EN_US_PACKAGE_NAME: target.dmg
EN_US_BINARY_URL:
- task-reference: https://queue.taskcluster.net/v1/task/<repackage>/artifacts/public/build
- MAR_TOOLS_URL:
- task-reference: https://queue.taskcluster.net/v1/task/<build>/artifacts/public/build/host/bin
+ artifact-reference: <repackage/{artifact_prefix}>
win.*:
EN_US_PACKAGE_NAME: target.zip
EN_US_BINARY_URL:
- task-reference: https://queue.taskcluster.net/v1/task/<build-signing>/artifacts/public/build
+ artifact-reference: <build-signing/{artifact_prefix}>
EN_US_INSTALLER_BINARY_URL:
- task-reference: https://queue.taskcluster.net/v1/task/<repackage-signing>/artifacts/public/build
- MAR_TOOLS_URL:
- task-reference: https://queue.taskcluster.net/v1/task/<build>/artifacts/public/build/host/bin
+ artifact-reference: <repackage-signing/{artifact_prefix}>
mozharness:
comm-checkout: true
config-paths:
- comm/mozharness
config:
# no default, so we fail on new entries
by-build-platform:
linux-nightly:
- single_locale/linux32.py
- - single_locale/{project}.py
- single_locale/tc_common.py
- - single_locale/tc_linux32.py
+ - single_locale/tc_linux_common.py
- single_locale/thunderbird.py
- taskcluster_nightly.py
linux64-nightly:
- single_locale/linux64.py
- - single_locale/{project}.py
- single_locale/tc_common.py
- - single_locale/tc_linux64.py
+ - single_locale/tc_linux_common.py
- single_locale/thunderbird.py
- taskcluster_nightly.py
macosx64-nightly:
- single_locale/macosx64.py
- - single_locale/{project}.py
- single_locale/tc_common.py
- single_locale/tc_macosx64.py
- single_locale/thunderbird.py
- taskcluster_nightly.py
win32-nightly:
- single_locale/win32.py
- - single_locale/{project}.py
- single_locale/tc_common.py
- single_locale/tc_win32.py
- single_locale/thunderbird.py
- taskcluster_nightly.py
win64-nightly:
- single_locale/win64.py
- - single_locale/{project}.py
- single_locale/tc_common.py
- single_locale/tc_win64.py
- single_locale/thunderbird.py
- taskcluster_nightly.py
- actions: [clone-locales, list-locales, setup, repack, summary]
+ actions: ['clone-locales', 'list-locales', 'setup', 'repack',
+ 'summary']
script: mozharness/scripts/desktop_l10n.py