Skip to content

Commit

Permalink
Bug 1501878 - beetmove complete mars. r=tomprince,Callek
Browse files Browse the repository at this point in the history
Differential Revision: https://phabricator.services.mozilla.com/D11732

--HG--
extra : moz-landing-system : lando
  • Loading branch information
escapewindow committed Nov 21, 2018
1 parent 9d55c67 commit 041b725
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
2 changes: 2 additions & 0 deletions taskcluster/ci/beetmover-repackage/kind.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ kind-dependencies:
- partials
- partials-signing
- repackage-signing-msi
- mar-signing
- mar-signing-l10n

primary-dependency:
- repackage
Expand Down
10 changes: 10 additions & 0 deletions taskcluster/taskgraph/transforms/beetmover_repackage.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,11 @@ def _compile_regex_mapping(mapping):
'target.installer.msi',
]

UPSTREAM_ARTIFACT_SIGNED_MAR_PATHS = [
'target.complete.mar',
'target.bz2.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()}
Expand Down Expand Up @@ -200,15 +205,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']
Expand Down Expand Up @@ -247,6 +255,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:
Expand Down Expand Up @@ -290,6 +299,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
Expand Down

0 comments on commit 041b725

Please sign in to comment.