diff --git a/taskcluster/ci/beetmover-snap/kind.yml b/taskcluster/ci/beetmover-snap/kind.yml deleted file mode 100644 index 28f73d4ab139..000000000000 --- a/taskcluster/ci/beetmover-snap/kind.yml +++ /dev/null @@ -1,19 +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.name_sanity:transforms - - taskgraph.transforms.beetmover:transforms - - taskgraph.transforms.beetmover_snap:transforms - - taskgraph.transforms.task:transforms - -kind-dependencies: - - release-snap-repackage # snap builds builds aren't signed - -job-template: - attributes: - artifact_map: taskcluster/taskgraph/manifests/firefox_snap.yml - shipping-phase: promote diff --git a/taskcluster/ci/release-snap-repackage/kind.yml b/taskcluster/ci/release-snap-repackage/kind.yml index 44060273f059..fe090e3cede9 100644 --- a/taskcluster/ci/release-snap-repackage/kind.yml +++ b/taskcluster/ci/release-snap-repackage/kind.yml @@ -59,7 +59,6 @@ jobs: firefox: shipping-product: firefox attributes: - build_platform: linux64-snap-nightly - build_type: opt + build_platform: linux64-nightly treeherder: symbol: Snap(r) diff --git a/taskcluster/docs/kinds.rst b/taskcluster/docs/kinds.rst index 25d0e7c176b0..46e83cbf874c 100644 --- a/taskcluster/docs/kinds.rst +++ b/taskcluster/docs/kinds.rst @@ -196,16 +196,14 @@ release-beetmover-push-to-release publishes promoted releases from the candidates directory to the release directory. This is part of release promotion. -beetmover-snap --------------- -Beetmover-source publishes Ubuntu's snap. This is part of release promotion. - beetmover-source ---------------- + Beetmover-source publishes release source. This is part of release promotion. beetmover-geckoview ------------------- + Beetmover-geckoview publishes the Android library called "geckoview". checksums-signing diff --git a/taskcluster/taskgraph/manifests/firefox_snap.yml b/taskcluster/taskgraph/manifests/firefox_snap.yml deleted file mode 100644 index 26d224011c29..000000000000 --- a/taskcluster/taskgraph/manifests/firefox_snap.yml +++ /dev/null @@ -1,37 +0,0 @@ ---- -s3_bucket_paths: - - pub/firefox/candidates -default_locales: # Ignored for snap - - en-US -tasktype_map: # Map task reference to task type. - release-snap-repackage: build -platform_names: - path_platform: '' - filename_platform: '' - -# A default entry, which the mappings below extend and override. -# Final 'destinations' will be the product of: -# s3_bucket_paths + destinations + locale_prefix + pretty_name -default: &default - all_locales: false - from: - - release-snap-repackage - locale_prefix: '' - source_path_modifier: '' - description: '' - destinations: - - ${version}-candidates/build${build_number}/snap - update_balrog_manifest: false - -mapping: - target.snap: - <<: *default - description: "The main installer we ship our mobile products baked within" - pretty_name: firefox-${version}.snap - checksums_path: firefox-${version}.snap.checksums - - target.snap.checksums: - <<: *default - description: "The checksums to the main installer." - pretty_name: firefox-${version}.snap.checksums - checksums_path: firefox-${version}.snap.checksums diff --git a/taskcluster/taskgraph/transforms/beetmover.py b/taskcluster/taskgraph/transforms/beetmover.py index 10f65a69358b..45cdb1df8dff 100644 --- a/taskcluster/taskgraph/transforms/beetmover.py +++ b/taskcluster/taskgraph/transforms/beetmover.py @@ -172,9 +172,7 @@ def make_task_description(config, jobs): dependencies = {dep_job.kind: dep_job.label} - # XXX release snap-repackage has a variable number of dependencies, depending on how many - # "post-beetmover-dummy" jobs there are in the graph. - if dep_job.kind != 'release-snap-repackage' and len(dep_job.dependencies) > 1: + if len(dep_job.dependencies) > 1: raise NotImplementedError( "Can't beetmove a signing task with multiple dependencies") signing_dependencies = dep_job.dependencies @@ -296,9 +294,7 @@ def make_task_worker(config, jobs): for job in jobs: valid_beetmover_job = (len(job["dependencies"]) == 2 and any(['signing' in j for j in job['dependencies']])) - # XXX release snap-repackage has a variable number of dependencies, depending on how many - # "post-beetmover-dummy" jobs there are in the graph. - if '-snap-' not in job['label'] and not valid_beetmover_job: + if not valid_beetmover_job: raise NotImplementedError("Beetmover must have two dependencies.") locale = job["attributes"].get("locale") diff --git a/taskcluster/taskgraph/transforms/beetmover_snap.py b/taskcluster/taskgraph/transforms/beetmover_snap.py deleted file mode 100644 index 7942e506677c..000000000000 --- a/taskcluster/taskgraph/transforms/beetmover_snap.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/. -""" -Transform the snap beetmover kind into an actual task description. -""" - -from __future__ import absolute_import, print_function, unicode_literals - -from taskgraph.transforms.base import TransformSequence - -transforms = TransformSequence() - - -@transforms.add -def leave_snap_repackage_dependencies_only(config, jobs): - for job in jobs: - # XXX: We delete the build dependency because, unlike the other beetmover - # tasks, source doesn't depend on any build task at all. This hack should - # go away when we rewrite beetmover transforms to allow more flexibility in deps - - job['dependencies'] = { - key: value - for key, value in job['dependencies'].items() - if key == 'release-snap-repackage' - } - - job['worker']['upstream-artifacts'] = [ - upstream_artifact - for upstream_artifact in job['worker']['upstream-artifacts'] - if upstream_artifact['taskId']['task-reference'] == '' - ] - - yield job - - -@transforms.add -def set_custom_treeherder_job_name(config, jobs): - for job in jobs: - job.get('treeherder', {})['symbol'] = 'Snap(BM)' - - yield job diff --git a/taskcluster/taskgraph/util/scriptworker.py b/taskcluster/taskgraph/util/scriptworker.py index 3cbd66cdba9a..8fa7bb7a576f 100644 --- a/taskcluster/taskgraph/util/scriptworker.py +++ b/taskcluster/taskgraph/util/scriptworker.py @@ -808,11 +808,6 @@ def should_use_artifact_map(platform, project): This function exists solely for the beetmover artifact map migration. """ - if 'linux64-snap-nightly' in platform: - # Snap has never been implemented outside of declarative artifacts. We need to use - # declarative artifacts no matter the branch we're on - return True - # FIXME: once we're ready to switch fully to declarative artifacts on other # branches, we can expand this; for now, Fennec is rolled-out to all # release branches, while Firefox only to mozilla-central