Bug 1424146: Refactor taskcluster l10n mozharness config; r?Callek
MozReview-Commit-ID: HrbI9grmjud
--- a/taskcluster/ci/l10n/kind.yml
+++ b/taskcluster/ci/l10n/kind.yml
@@ -78,29 +78,33 @@ job-template:
android-api-16-l10n: android-4-0-armv7-api16/opt
mozharness:
config:
by-build-platform:
linux-l10n:
- single_locale/production.py
- single_locale/{project}.py
- single_locale/linux32.py
+ - single_locale/tc_common.py
- single_locale/tc_linux32.py
linux64-l10n:
- single_locale/production.py
- single_locale/{project}.py
- single_locale/linux64.py
+ - single_locale/tc_common.py
- single_locale/tc_linux64.py
macosx64:
- single_locale/production.py
- single_locale/{project}.py
- single_locale/macosx64.py
+ - single_locale/tc_common.py
- single_locale/tc_macosx64.py
android-api-16-l10n:
- 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
options:
- total-chunks=1
- this-chunk=1
actions:
by-build-platform:
default: [clone-locales list-locales setup repack summary]
--- a/taskcluster/ci/nightly-l10n/kind.yml
+++ b/taskcluster/ci/nightly-l10n/kind.yml
@@ -147,75 +147,86 @@ job-template:
task-reference: https://queue.taskcluster.net/v1/task/<unsigned-build>/artifacts/public/build/en-US
mozharness:
config:
by-build-platform:
linux-nightly:
- single_locale/production.py
- single_locale/{project}.py
- single_locale/linux32.py
+ - single_locale/tc_common.py
- single_locale/tc_linux32.py
- taskcluster_nightly.py
linux64-nightly:
- single_locale/production.py
- single_locale/{project}.py
- single_locale/linux64.py
+ - single_locale/tc_common.py
- single_locale/tc_linux64.py
- taskcluster_nightly.py
macosx64-nightly:
- single_locale/production.py
- single_locale/{project}.py
- single_locale/macosx64.py
+ - single_locale/tc_common.py
- single_locale/tc_macosx64.py
- taskcluster_nightly.py
win32-nightly:
- single_locale/production.py
- single_locale/{project}.py
- single_locale/win32.py
+ - single_locale/tc_common.py
- single_locale/tc_win32.py
- taskcluster_nightly.py
win64-nightly:
- single_locale/production.py
- single_locale/{project}.py
- single_locale/win64.py
+ - single_locale/tc_common.py
- single_locale/tc_win64.py
- taskcluster_nightly.py
linux-devedition-nightly:
- single_locale/production.py
- single_locale/{project}.py
- single_locale/linux_devedition.py
+ - single_locale/tc_common.py
- single_locale/tc_linux32.py
- taskcluster_nightly.py
linux64-devedition-nightly:
- single_locale/production.py
- single_locale/{project}.py
- single_locale/linux64_devedition.py
+ - single_locale/tc_common.py
- single_locale/tc_linux64.py
- taskcluster_nightly.py
macosx64-devedition-nightly:
- single_locale/production.py
- single_locale/{project}.py
- single_locale/macosx64_devedition.py
+ - single_locale/tc_common.py
- single_locale/tc_macosx64.py
- taskcluster_nightly.py
win32-devedition-nightly:
- single_locale/production.py
- single_locale/{project}.py
- single_locale/win32_devedition.py
+ - single_locale/tc_common.py
- single_locale/tc_win32.py
- taskcluster_nightly.py
win64-devedition-nightly:
- single_locale/production.py
- single_locale/{project}.py
- 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
options:
- revision=$GECKO_HEAD_REV
actions:
by-build-platform:
default: ['clone-locales', 'list-locales', 'setup', 'repack',
'submit-to-balrog', 'summary']
--- a/testing/mozharness/configs/single_locale/tc_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/tc_android-api-16.py
@@ -8,18 +8,16 @@ config = {
"output_dir": "%(abs_work_dir)s/src",
},
"tooltool_servers": ['http://relengapi/tooltool/'],
"upload_env": {
'UPLOAD_HOST': 'localhost',
'UPLOAD_PATH': '/builds/worker/artifacts/',
},
- "mozilla_dir": "src/",
- "simple_name_move": True,
'secret_files': [
{'filename': '/builds/gapi.data',
'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/gapi.data',
'min_scm_level': 1},
{'filename': '/builds/mozilla-fennec-geoloc-api.key',
'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/mozilla-fennec-geoloc-api.key',
'min_scm_level': 2, 'default': 'try-build-has-no-secrets'},
{'filename': '/builds/adjust-sdk.token',
new file mode 100644
--- /dev/null
+++ b/testing/mozharness/configs/single_locale/tc_common.py
@@ -0,0 +1,8 @@
+config = {
+ "mozilla_dir": "src/",
+ "simple_name_move": True,
+ "update_gecko_source_to_enUS": False,
+
+ # Override the buildbot path to not read it
+ "buildbot_json_path": None,
+}
--- a/testing/mozharness/configs/single_locale/tc_linux32.py
+++ b/testing/mozharness/configs/single_locale/tc_linux32.py
@@ -14,11 +14,9 @@ config = {
"L10NBASEDIR": "../../l10n",
"MOZ_MAKE_COMPLETE_MAR": "1",
'TOOLTOOL_CACHE': os.environ.get('TOOLTOOL_CACHE'),
},
"upload_env": {
'UPLOAD_HOST': 'localhost',
'UPLOAD_PATH': '/builds/worker/artifacts/',
},
- "mozilla_dir": "src/",
- "simple_name_move": True,
}
--- a/testing/mozharness/configs/single_locale/tc_linux64.py
+++ b/testing/mozharness/configs/single_locale/tc_linux64.py
@@ -14,11 +14,9 @@ config = {
"L10NBASEDIR": "../../l10n",
"MOZ_MAKE_COMPLETE_MAR": "1",
'TOOLTOOL_CACHE': os.environ.get('TOOLTOOL_CACHE'),
},
"upload_env": {
'UPLOAD_HOST': 'localhost',
'UPLOAD_PATH': '/builds/worker/artifacts/',
},
- "mozilla_dir": "src/",
- "simple_name_move": True,
}
--- a/testing/mozharness/configs/single_locale/tc_macosx64.py
+++ b/testing/mozharness/configs/single_locale/tc_macosx64.py
@@ -16,12 +16,10 @@ config = {
'TOOLTOOL_CACHE': os.environ.get('TOOLTOOL_CACHE'),
},
"upload_env": {
'UPLOAD_HOST': 'localhost',
'UPLOAD_PATH': '/builds/worker/artifacts/',
},
"tooltool_url": 'http://relengapi/tooltool/',
- "mozilla_dir": "src/",
- "simple_name_move": True,
}
--- a/testing/mozharness/configs/single_locale/tc_win32.py
+++ b/testing/mozharness/configs/single_locale/tc_win32.py
@@ -24,15 +24,9 @@ config = {
},
"upload_env": {
'UPLOAD_HOST': 'localhost',
'UPLOAD_PATH': os.path.join(os.getcwd(), 'public', 'build'),
},
"tooltool_url": 'http://relengapi/tooltool/',
'tooltool_manifest_src': "browser/config/tooltool-manifests/win32/releng.manifest",
- "mozilla_dir": "src/",
- "simple_name_move": True,
- "update_gecko_source_to_enUS": False,
-
- # Override the buildbot path to not read it
- "buildbot_json_path": None,
}
--- a/testing/mozharness/configs/single_locale/tc_win64.py
+++ b/testing/mozharness/configs/single_locale/tc_win64.py
@@ -24,16 +24,10 @@ config = {
},
"upload_env": {
'UPLOAD_HOST': 'localhost',
'UPLOAD_PATH': os.path.join(os.getcwd(), 'public', 'build'),
},
"tooltool_url": 'http://relengapi/tooltool/',
'tooltool_manifest_src': "browser/config/tooltool-manifests/win64/releng.manifest",
- "mozilla_dir": "src/",
- "simple_name_move": True,
- "update_gecko_source_to_enUS": False,
-
- # Override the buildbot path to not read it
- "buildbot_json_path": None,
}