From 75e9aaf9903349083ae3d928c2715ebbd37836c9 Mon Sep 17 00:00:00 2001 From: Johan Lorenzo Date: Tue, 31 Jan 2023 14:42:02 +0100 Subject: [PATCH] Bug 1808607 - part 3: Delete `mark-as-shipped` task for already being covered existing kind --- taskcluster/ci/mark-as-shipped/kind.yml | 41 ------------------ .../transforms/mark_as_shipped.py | 42 ------------------- 2 files changed, 83 deletions(-) delete mode 100644 taskcluster/ci/mark-as-shipped/kind.yml delete mode 100644 taskcluster/fenix_taskgraph/transforms/mark_as_shipped.py diff --git a/taskcluster/ci/mark-as-shipped/kind.yml b/taskcluster/ci/mark-as-shipped/kind.yml deleted file mode 100644 index d47054730..000000000 --- a/taskcluster/ci/mark-as-shipped/kind.yml +++ /dev/null @@ -1,41 +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: fenix_taskgraph.loader.multi_dep:loader - -transforms: - - fenix_taskgraph.transforms.multi_dep:transforms - - fenix_taskgraph.transforms.mark_as_shipped:transforms - - taskgraph.transforms.task:transforms - -kind-dependencies: - - beetmover - - push-apk - -primary-dependency: push-apk - -group-by: build-type - -only-for-build-types: - - beta - - release - -job-template: - attributes: - shipping_phase: ship - description: Mark Fenix as shipped in ship-it - worker-type: ship-it - scopes: - by-level: - '3': - - project:releng:ship-it:action:mark-as-shipped - - project:releng:ship-it:server:production - default: - - project:releng:ship-it:action:mark-as-shipped - - project:releng:ship-it:server:staging - worker: {} - - treeherder: - job-symbol: mark-shipped - kind: build diff --git a/taskcluster/fenix_taskgraph/transforms/mark_as_shipped.py b/taskcluster/fenix_taskgraph/transforms/mark_as_shipped.py deleted file mode 100644 index 08a13f544..000000000 --- a/taskcluster/fenix_taskgraph/transforms/mark_as_shipped.py +++ /dev/null @@ -1,42 +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/. -""" -Apply some defaults and minor modifications to the jobs defined in the build -kind. -""" - -from taskgraph.transforms.base import TransformSequence -from taskgraph.util.schema import resolve_keyed_by - - -transforms = TransformSequence() - - -@transforms.add -def resolve_keys(config, tasks): - for task in tasks: - resolve_keyed_by( - task, - "scopes", - item_name=task["name"], - **{ - "level": config.params["level"], - } - ) - yield task - - -@transforms.add -def make_task_description(config, tasks): - for task in tasks: - product = "Fenix" - version = config.params["version"] or "{ver}" - task["worker"][ - "release-name" - ] = "{product}-{version}-build{build_number}".format( - product=product, - version=version, - build_number=config.params.get("build_number", 1), - ) - yield task