From fe22b57ca91d6e11d0aca1ca25faf359f7ee51d3 Mon Sep 17 00:00:00 2001 From: Johan Lorenzo Date: Tue, 31 Jan 2023 14:42:48 +0100 Subject: [PATCH] Bug 1808607 - part 4: Delete `version-bump` task for already being covered existing kind (cherry picked from commit 2373353521fe2aa7985a071fab4ad5a7d89f5d05) --- taskcluster/ci/version-bump/kind.yml | 41 ------------------- .../transforms/version_bump.py | 40 ------------------ 2 files changed, 81 deletions(-) delete mode 100644 taskcluster/ci/version-bump/kind.yml delete mode 100644 taskcluster/fenix_taskgraph/transforms/version_bump.py diff --git a/taskcluster/ci/version-bump/kind.yml b/taskcluster/ci/version-bump/kind.yml deleted file mode 100644 index d197bea661..0000000000 --- a/taskcluster/ci/version-bump/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.version_bump:transforms - - taskgraph.transforms.task:transforms - -kind-dependencies: - - push-apk - -primary-dependency: push-apk - -group-by: build-type - -only-for-build-types: - - beta - - release - -job-template: - attributes: - shipping_phase: ship - description: Fenix version bump/tag - worker-type: tree - worker: - bump: true - bump-files: ["version.txt"] - push: - by-level: - "3": true - # If you set the following line to true, you need to grant write access - # to https://github.com/moz-releng-automation-stage on your - # fork. - default: false - - treeherder: - job-symbol: vb - kind: build diff --git a/taskcluster/fenix_taskgraph/transforms/version_bump.py b/taskcluster/fenix_taskgraph/transforms/version_bump.py deleted file mode 100644 index bbfdae2234..0000000000 --- a/taskcluster/fenix_taskgraph/transforms/version_bump.py +++ /dev/null @@ -1,40 +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 version bump kind -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: - for key in ("worker.push",): - resolve_keyed_by( - task, - key, - item_name=task["name"], - **{ - "build-type": task["attributes"]["build-type"], - "level": config.params["level"], - } - ) - yield task - - -@transforms.add -def build_worker_definition(config, tasks): - for task in tasks: - worker_definition = { - "branch": config.params["head_ref"], - } - task["worker"].update(worker_definition) - - yield task