зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1501878 - beetmove complete mars. r=tomprince
Differential Revision: https://phabricator.services.mozilla.com/D11732 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Родитель
34f6a8c712
Коммит
3f0291802e
|
@ -24,6 +24,8 @@ kind-dependencies:
|
|||
- partials
|
||||
- partials-signing
|
||||
- repackage-signing-msi
|
||||
- mar-signing
|
||||
- mar-signing-l10n
|
||||
|
||||
primary-dependency:
|
||||
- repackage
|
||||
|
|
|
@ -138,6 +138,10 @@ UPSTREAM_ARTIFACT_SIGNED_MSI_PATHS = [
|
|||
'target.installer.msi',
|
||||
]
|
||||
|
||||
UPSTREAM_ARTIFACT_SIGNED_MAR_PATHS = [
|
||||
'target.complete.mar',
|
||||
]
|
||||
|
||||
# Voluptuous uses marker objects as dictionary *keys*, but they are not
|
||||
# comparable, so we cast all of the keys back to regular strings
|
||||
task_description_schema = {str(k): v for k, v in task_description_schema.schema.iteritems()}
|
||||
|
@ -210,15 +214,18 @@ def make_task_description(config, jobs):
|
|||
repackage_name = "repackage"
|
||||
repackage_signing_name = "repackage-signing"
|
||||
msi_signing_name = "repackage-signing-msi"
|
||||
mar_signing_name = "mar-signing"
|
||||
if job.get('locale'):
|
||||
signing_name = "nightly-l10n-signing"
|
||||
build_name = "nightly-l10n"
|
||||
repackage_name = "repackage-l10n"
|
||||
repackage_signing_name = "repackage-signing-l10n"
|
||||
mar_signing_name = "mar-signing-l10n"
|
||||
dependencies = {
|
||||
"build": upstream_deps[build_name],
|
||||
"repackage": upstream_deps[repackage_name],
|
||||
"signing": upstream_deps[signing_name],
|
||||
"mar-signing": upstream_deps[mar_signing_name],
|
||||
}
|
||||
if 'partials-signing' in upstream_deps:
|
||||
dependencies['partials-signing'] = upstream_deps['partials-signing']
|
||||
|
@ -257,6 +264,7 @@ def generate_upstream_artifacts(job, dependencies, platform, locale=None, projec
|
|||
repackage_mapping = UPSTREAM_ARTIFACT_REPACKAGE_PATHS
|
||||
repackage_signing_mapping = UPSTREAM_ARTIFACT_SIGNED_REPACKAGE_PATHS
|
||||
msi_signing_mapping = UPSTREAM_ARTIFACT_SIGNED_MSI_PATHS
|
||||
mar_signing_mapping = UPSTREAM_ARTIFACT_SIGNED_MAR_PATHS
|
||||
|
||||
artifact_prefix = get_artifact_prefix(job)
|
||||
if locale:
|
||||
|
@ -300,6 +308,7 @@ def generate_upstream_artifacts(job, dependencies, platform, locale=None, projec
|
|||
('repackage', 'repackage', repackage_mapping),
|
||||
('repackage-signing', 'repackage', repackage_signing_mapping),
|
||||
('repackage-signing-msi', 'repackage', msi_signing_mapping),
|
||||
('mar-signing', 'signing', mar_signing_mapping),
|
||||
]:
|
||||
if task_type not in dependencies:
|
||||
continue
|
||||
|
|
Загрузка…
Ссылка в новой задаче