Bug 1376550 - remove beetmover-repackage-l10n kind. r=dustin
Support OSX Signed nightlies (in the complete.mar too)
MozReview-Commit-ID: HkGRRm7k2Ra
--- a/taskcluster/ci/balrog/kind.yml
+++ b/taskcluster/ci/balrog/kind.yml
@@ -7,13 +7,12 @@ loader: taskgraph.loader.single_dep:load
transforms:
- taskgraph.transforms.balrog:transforms
- taskgraph.transforms.task:transforms
kind-dependencies:
- beetmover
- beetmover-l10n
- beetmover-repackage
- - beetmover-repackage-l10n
only-for-attributes:
- nightly
- signed
deleted file mode 100644
--- a/taskcluster/ci/beetmover-repackage-l10n/kind.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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
-
-transforms:
- - taskgraph.transforms.beetmover_repackage_l10n:transforms
- - taskgraph.transforms.beetmover_repackage:transforms
- - taskgraph.transforms.task:transforms
-
-kind-dependencies:
- - repackage-l10n
-
-only-for-build-platforms:
- - macosx64-nightly/opt
--- a/taskcluster/ci/beetmover-repackage/kind.yml
+++ b/taskcluster/ci/beetmover-repackage/kind.yml
@@ -1,15 +1,16 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# 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
transforms:
+ - taskgraph.transforms.beetmover_repackage_l10n:transforms
- taskgraph.transforms.beetmover_repackage:transforms
- taskgraph.transforms.task:transforms
kind-dependencies:
- repackage
only-for-build-platforms:
- macosx64-nightly/opt
--- a/taskcluster/ci/checksums-signing/kind.yml
+++ b/taskcluster/ci/checksums-signing/kind.yml
@@ -7,12 +7,11 @@ loader: taskgraph.loader.single_dep:load
transforms:
- taskgraph.transforms.checksums_signing:transforms
- taskgraph.transforms.task:transforms
kind-dependencies:
- beetmover
- beetmover-l10n
- beetmover-repackage
- - beetmover-repackage-l10n
only-for-attributes:
- nightly
--- a/taskcluster/docs/kinds.rst
+++ b/taskcluster/docs/kinds.rst
@@ -190,26 +190,16 @@ the language in the final artifact names
beetmover-repackage
-------------------
Beetmover-repackage is beetmover but for tasks that need an intermediate step
between signing and packaging, such as OSX. For more details see the definitions
of the Beetmover kind above and the repackage kind below.
-beetmover-repackage-l10n
-------------------------
-Same as beetmover-repackage but for l10n.
-
-Beetmover L10n, takes specific artifacts, "Beets", and pushes them to a location outside
-of Taskcluster's task artifacts, (archive.mozilla.org as one place) and in the
-process determines the final location and a "pretty" name (versioned product name)
-This separate kind uses logic specific to localized artifacts, such as including
-the language in the final artifact names.
-
checksums-signing
-----------------
Checksums-signing take as input the checksums file generated by beetmover tasks
and sign it via the signing scriptworkers. Returns the same file signed and
additional detached signature.
beetmover-checksums
-------------------
--- a/taskcluster/taskgraph/transforms/beetmover_repackage_l10n.py
+++ b/taskcluster/taskgraph/transforms/beetmover_repackage_l10n.py
@@ -15,17 +15,18 @@ transforms = TransformSequence()
@transforms.add
def make_beetmover_description(config, jobs):
for job in jobs:
dep_job = job['dependent-task']
locale = dep_job.attributes.get('locale')
if not locale:
- return
+ yield job
+ continue
label = job.get('label',
"beetmover-{}-{}".format(locale, dep_job.label))
group = 'tc-BMR-L10n'
# add the locale code
symbol = locale