Bug 1489405 - Backed out changeset 1f47a5207daa r=jlorenzo
deleted file mode 100644
--- a/taskcluster/ci/bouncer-locations-breakpoint/kind.yml
+++ /dev/null
@@ -1,31 +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.transform:loader
-
-transforms:
- - taskgraph.transforms.bouncer_locations_breakpoint:transforms
- - taskgraph.transforms.task:transforms
-
-job-defaults:
- description: nightly bouncer locations breakpoint job
- attributes:
- build_platform: linux64-nightly
- nightly: true
- worker-type:
- by-project:
- mozilla-central: null-provisioner/human-breakpoint
- default: invalid/invalid
- worker:
- implementation: bouncer-locations-breakpoint
- run-on-projects: ['mozilla-central']
- treeherder:
- symbol: BncLoc-Br
- kind: other
- tier: 2
-
-jobs:
- firefox:
- treeherder:
- platform: firefox-release/opt
--- a/taskcluster/ci/bouncer-locations/kind.yml
+++ b/taskcluster/ci/bouncer-locations/kind.yml
@@ -3,19 +3,16 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
loader: taskgraph.loader.transform:loader
transforms:
- taskgraph.transforms.bouncer_locations:transforms
- taskgraph.transforms.task:transforms
-kind-dependencies:
- - bouncer-locations-breakpoint
-
job-defaults:
description: nightly bouncer locations job
attributes:
build_platform: linux64-nightly
nightly: true
worker-type:
by-project:
mozilla-central: scriptworker-prov-v1/bouncer-v1
--- a/taskcluster/docs/kinds.rst
+++ b/taskcluster/docs/kinds.rst
@@ -306,20 +306,16 @@ Update Bouncer's (download.mozilla.org)
cron-bouncer-check
------------------
Checks Bouncer (download.mozilla.org) uptake.
bouncer-locations
-----------------
Updates nightly bouncer locations for version bump
-bouncer-locations-breakpoint
-----------------------------
-Human breakpoint to block the running of the bouncer locations job until shippable builds are implemented
-
release-bouncer-check
---------------------
Checks Bouncer (download.mozilla.org) uptake as part of the release tasks.
release-generate-checksums
--------------------------
Generate the per-release checksums along with the summaries
--- a/taskcluster/taskgraph/transforms/bouncer_locations.py
+++ b/taskcluster/taskgraph/transforms/bouncer_locations.py
@@ -23,17 +23,11 @@ def make_task_worker(config, jobs):
resolve_keyed_by(
job, 'scopes', item_name=job['name'], project=config.params['project']
)
resolve_keyed_by(
job, 'bouncer-products', item_name=job['name'], project=config.params['project']
)
job['worker']['bouncer-products'] = job['bouncer-products']
+
del job['bouncer-products']
-
- # chain the breakpoint as dependency to this task
- dependencies = {}
- for dep_task in config.kind_dependencies_tasks:
- dependencies[dep_task.kind] = dep_task.label
-
- job.setdefault('dependencies', {}).update(dependencies)
yield job
deleted file mode 100644
--- a/taskcluster/taskgraph/transforms/bouncer_locations_breakpoint.py
+++ /dev/null
@@ -1,24 +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/.
-from __future__ import absolute_import, print_function, unicode_literals
-
-import logging
-
-from taskgraph.transforms.base import TransformSequence
-from taskgraph.util.schema import resolve_keyed_by
-
-logger = logging.getLogger(__name__)
-
-
-transforms = TransformSequence()
-
-
-@transforms.add
-def make_task_worker(config, jobs):
- for job in jobs:
- resolve_keyed_by(
- job, 'worker-type', item_name=job['name'], project=config.params['project']
- )
- job['worker']['payload'] = {}
- yield job
--- a/taskcluster/taskgraph/transforms/task.py
+++ b/taskcluster/taskgraph/transforms/task.py
@@ -567,19 +567,16 @@ task_description_schema = Schema({
}],
}, {
Required('implementation'): 'bouncer-aliases',
Required('entries'): object,
}, {
Required('implementation'): 'bouncer-locations',
Required('bouncer-products'): [basestring],
}, {
- Required('implementation'): 'bouncer-locations-breakpoint',
- Required('payload'): object,
- }, {
Required('implementation'): 'bouncer-submission',
Required('locales'): [basestring],
Required('entries'): object,
}, {
Required('implementation'): 'invalid',
# an invalid task is one which should never actually be created; this is used in
# release automation on branches where the task just doesn't make sense
Extra: object,
@@ -1218,21 +1215,16 @@ def build_bouncer_locations_payload(conf
release_config = get_release_config(config)
task_def['payload'] = {
'bouncer_products': worker['bouncer-products'],
'version': release_config['version'],
}
-@payload_builder('bouncer-locations-breakpoint')
-def build_bouncer_locations_breakpoint_payload(config, task, task_def):
- task_def['payload'] = task['worker']['payload']
-
-
@payload_builder('bouncer-submission')
def build_bouncer_submission_payload(config, task, task_def):
worker = task['worker']
task_def['payload'] = {
'locales': worker['locales'],
'submission_entries': worker['entries']
}