From bdcdb2a7be51f07ee5e15e49f6ada51900acabff Mon Sep 17 00:00:00 2001 From: Aki Sasaki Date: Fri, 21 Feb 2020 00:00:59 +0000 Subject: [PATCH] Bug 1562412 - release-{eme-free,partner}-repack-signing multi_dep. r=nthomas Differential Revision: https://phabricator.services.mozilla.com/D58069 --HG-- extra : moz-landing-system : lando --- .../ci/release-eme-free-repack-signing/kind.yml | 12 ++++++++---- .../ci/release-partner-repack-signing/kind.yml | 12 ++++++++---- taskcluster/taskgraph/transforms/partner_signing.py | 11 +++++++++++ 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/taskcluster/ci/release-eme-free-repack-signing/kind.yml b/taskcluster/ci/release-eme-free-repack-signing/kind.yml index 801d04b0e6e2..173b73672b4e 100644 --- a/taskcluster/ci/release-eme-free-repack-signing/kind.yml +++ b/taskcluster/ci/release-eme-free-repack-signing/kind.yml @@ -2,17 +2,21 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. --- -loader: taskgraph.loader.single_dep:loader +loader: taskgraph.loader.multi_dep:loader + +group-by: partner-repack-ids transforms: - taskgraph.transforms.chunk_partners:transforms - - taskgraph.transforms.name_sanity:transforms - taskgraph.transforms.partner_signing:transforms - taskgraph.transforms.signing:transforms - taskgraph.transforms.task:transforms kind-dependencies: - - release-eme-free-repack + - release-eme-free-repack-notarization-part-1 + - release-eme-free-repack-notarization-poller + +primary-dependency: release-eme-free-repack-notarization-part-1 only-for-build-platforms: - macosx64-shippable/opt @@ -22,4 +26,4 @@ job-template: shipping-product: firefox shipping-phase: promote max-run-time: 3600 - repacks-per-chunk: 5 + copy-repack-ids: true diff --git a/taskcluster/ci/release-partner-repack-signing/kind.yml b/taskcluster/ci/release-partner-repack-signing/kind.yml index 7d6c5ef9f2f0..0d4a84923c44 100644 --- a/taskcluster/ci/release-partner-repack-signing/kind.yml +++ b/taskcluster/ci/release-partner-repack-signing/kind.yml @@ -2,17 +2,21 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. --- -loader: taskgraph.loader.single_dep:loader +loader: taskgraph.loader.multi_dep:loader + +group-by: partner-repack-ids transforms: - taskgraph.transforms.chunk_partners:transforms - - taskgraph.transforms.name_sanity:transforms - taskgraph.transforms.partner_signing:transforms - taskgraph.transforms.signing:transforms - taskgraph.transforms.task:transforms kind-dependencies: - - release-partner-repack + - release-partner-repack-notarization-part-1 + - release-partner-repack-notarization-poller + +primary-dependency: release-partner-repack-notarization-part-1 only-for-build-platforms: - macosx64-nightly/opt @@ -22,4 +26,4 @@ job-template: shipping-product: firefox shipping-phase: promote max-run-time: 3600 - repacks-per-chunk: 5 + copy-repack-ids: true diff --git a/taskcluster/taskgraph/transforms/partner_signing.py b/taskcluster/taskgraph/transforms/partner_signing.py index 876d84c776f4..4b94896c2228 100644 --- a/taskcluster/taskgraph/transforms/partner_signing.py +++ b/taskcluster/taskgraph/transforms/partner_signing.py @@ -17,6 +17,17 @@ transforms = TransformSequence() transforms.add(check_if_partners_enabled) +@transforms.add +def set_mac_label(config, jobs): + for job in jobs: + dep_job = job['primary-dependency'] + job.setdefault('label', dep_job.label.replace('notarization-part-1', 'signing')) + assert job['label'] != dep_job.label, "Unable to determine label for {}".format( + config.kind + ) + yield job + + @transforms.add def define_upstream_artifacts(config, jobs): partner_configs = get_partner_config_by_kind(config, config.kind)