From 9f18f89db311a76438306cf91187782ca604e444 Mon Sep 17 00:00:00 2001 From: Aki Sasaki Date: Fri, 16 Nov 2018 21:01:13 +0000 Subject: [PATCH] Bug 1501878 - point partials at unsigned complete mars. r=tomprince Partial MAR generation doesn't need a signed complete MAR. By pointing the partials tasks at the unsigned complete MARs, we are able to defer signing the complete MARs without deferring partials creation. Differential Revision: https://phabricator.services.mozilla.com/D11729 --HG-- extra : moz-landing-system : lando --- taskcluster/ci/partials/kind.yml | 4 ++-- taskcluster/taskgraph/transforms/partials.py | 17 +++-------------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/taskcluster/ci/partials/kind.yml b/taskcluster/ci/partials/kind.yml index a99181e2b5ed..c267c720b56e 100644 --- a/taskcluster/ci/partials/kind.yml +++ b/taskcluster/ci/partials/kind.yml @@ -10,8 +10,8 @@ transforms: - taskgraph.transforms.task:transforms kind-dependencies: - - repackage-signing - - repackage-signing-l10n + - repackage + - repackage-l10n only-for-attributes: - nightly diff --git a/taskcluster/taskgraph/transforms/partials.py b/taskcluster/taskgraph/transforms/partials.py index 9361190a5ea1..59a1865f6197 100644 --- a/taskcluster/taskgraph/transforms/partials.py +++ b/taskcluster/taskgraph/transforms/partials.py @@ -58,16 +58,13 @@ def make_task_description(config, jobs): dependent_kind = str(dep_job.kind) dependencies = {dependent_kind: dep_job.label} - signing_dependencies = dep_job.dependencies - # This is so we get the build task etc in our dependencies to - # have better beetmover support. - dependencies.update(signing_dependencies) attributes = copy_attributes_from_dependent_job(dep_job) locale = dep_job.attributes.get('locale') if locale: attributes['locale'] = locale treeherder['symbol'] = "p({})".format(locale) + attributes['shipping_phase'] = job['shipping-phase'] build_locale = locale or 'en-US' @@ -79,20 +76,12 @@ def make_task_description(config, jobs): if not builds: continue - signing_task = None - for dependency in sorted(dependencies.keys()): - if 'repackage-signing-l10n' in dependency: - signing_task = dependency - break - if 'repackage-signing' in dependency: - signing_task = dependency - break - signing_task_ref = '<{}>'.format(signing_task) + dep_task_ref = '<{}>'.format(dependent_kind) extra = {'funsize': {'partials': list()}} update_number = 1 artifact_path = "{}{}".format( - get_taskcluster_artifact_prefix(dep_job, signing_task_ref, locale=locale), + get_taskcluster_artifact_prefix(dep_job, dep_task_ref, locale=locale), 'target.complete.mar' ) for build in sorted(builds):