Backed out changeset 11f48aaae955 (bug 1481916) as per aki's request. a=backout

This commit is contained in:
Razvan Maries 2019-11-19 23:42:37 +02:00
parent 1539b038c7
commit 9f99f50322
7 changed files with 6 additions and 147 deletions

View File

@ -218,15 +218,3 @@ jobs:
- mozilla-central
when:
- {hour: 16, minute: 00}
- name: l10n-bumper
job:
type: decision-task
treeherder-symbol: l10n-bump
target-tasks-method: l10n_bump
run-on-projects:
- mozilla-central
- mozilla-beta
- mozilla-esr68
when:
- {minute: 45}

View File

@ -34,7 +34,6 @@ treeherder:
'Fxfn-r': 'Firefox functional tests (remote)'
'Fxfn-r-1proc': 'Firefox functional tests (remote) without e10s'
'iris': 'Iris testing suite'
'l10n-bump': 'L10n Bumper'
'M': 'Mochitests'
'M-1proc': 'Mochitests without e10s'
'M-fis': 'Mochitests with fission enabled'

View File

@ -1,86 +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.release_version_bump:transforms
- taskgraph.transforms.task:transforms
job-defaults:
worker-type:
by-project:
mozilla-(beta|central|release|esr.*): scriptworker-k8s/gecko-3-tree
default: scriptworker-k8s/gecko-1-tree
worker:
implementation: treescript
tags: []
bump: false
dontbuild: true
ignore-closed-tree: False
push:
by-project:
mozilla-(central|beta|release|esr.*): true
default: false
l10n-bump-info:
by-release-type:
esr.*:
name: Firefox l10n changesets
path: mobile/locales/l10n-changesets.json
version-path: mobile/android/config/version-files/release/version.txt
revision-url: "https://l10n.mozilla.org/shipping/l10n-changesets?av=fennec%(MAJOR_VERSION)s"
platform-configs: [{
"platforms": ["android-multilocale"],
"path": "mobile/android/locales/maemo-locales",
}]
default:
name: Firefox l10n changesets
path: browser/locales/l10n-changesets.json
version-path: browser/config/version.txt
revision-url: "https://l10n.mozilla.org/shipping/l10n-changesets?av=fx%(MAJOR_VERSION)s"
ignore-config:
ja:
- macosx64
- macosx64-devedition
ja-JP-mac:
- linux
- linux-devedition
- linux64
- linux64-devedition
- win32
- win32-devedition
- win64
- win64-devedition
- win64-aarch64
- win64-aarch64-devedition
platform-configs: [{
"platforms": [
"linux",
"linux-devedition",
"linux64",
"linux64-devedition",
"macosx64",
"macosx64-devedition",
"win32",
"win32-devedition",
"win64",
"win64-devedition",
"win64-aarch64",
"win64-aarch64-devedition",
],
"path": "browser/locales/shipped-locales",
"format": "shipped-locales",
}]
jobs:
l10n-bumper:
name: l10n_bumper
description: l10n changesets bumper
run-on-projects: []
treeherder:
kind: build
platform: linux64/opt
symbol: l10n-bump
tier: 1

View File

@ -616,7 +616,3 @@ by another task that produces a jobs.json artifact
iris
----
Iris testing suite
l10n-bump
---------
Cron-driven tasks that bump l10n-changesets files in-tree, using data from the l10n dashboard.

View File

@ -698,16 +698,6 @@ def target_tasks_file_update(full_task_graph, parameters, graph_config):
return [l for l, t in full_task_graph.tasks.iteritems() if filter(t)]
@_target_task('l10n_bump')
def target_tasks_l10n_bump(full_task_graph, parameters, graph_config):
"""Select the set of tasks required to perform l10n bumping.
"""
def filter(task):
# For now any task in the repo-update kind is ok
return task.kind in ['l10n-bump']
return [l for l, t in full_task_graph.tasks.iteritems() if filter(t)]
@_target_task('cron_bouncer_check')
def target_tasks_bouncer_check(full_task_graph, parameters, graph_config):
"""Select the set of tasks required to perform bouncer version verification.

View File

@ -16,16 +16,13 @@ transforms = TransformSequence()
@transforms.add
def handle_keyed_by(config, tasks):
"""Resolve fields that can be keyed by platform, etc."""
default_fields = [
fields = [
'worker.push',
'worker.bump-files',
'worker-type',
]
for task in tasks:
fields = default_fields[:]
if task["worker"].get("l10n-bump-info"):
fields.append('worker.l10n-bump-info')
for field in fields:
resolve_keyed_by(task, field, item_name=task['name'],
**config.params)
project=config.params['project'])
yield task

View File

@ -1244,29 +1244,15 @@ def build_push_addons_payload(config, task, task_def):
Optional('bump-files'): [basestring],
Optional('repo-param-prefix'): basestring,
Optional('dontbuild'): bool,
Optional('ignore-closed-tree'): bool,
Required('force-dry-run', default=True): bool,
Required('push', default=False): bool,
Optional('l10n-bump-info'): {
Required('name'): basestring,
Required('path'): basestring,
Required('version-path'): basestring,
Required('revision-url'): basestring,
Optional('ignore-config'): object,
Required('platform-configs'): [{
Required('platforms'): [basestring],
Required('path'): basestring,
Optional('format'): basestring,
}],
},
Required('push', default=False): bool
})
def build_treescript_payload(config, task, task_def):
worker = task['worker']
release_config = get_release_config(config)
task_def['payload'] = {'actions': []}
task_def['payload'] = {}
task_def.setdefault('scopes', [])
actions = task_def['payload']['actions']
if worker['tags']:
tag_names = []
product = task['shipping-product'].upper()
@ -1285,7 +1271,7 @@ def build_treescript_payload(config, task, task_def):
'revision': config.params['{}head_rev'.format(worker.get('repo-param-prefix', ''))],
}
task_def['payload']['tag_info'] = tag_info
actions.append('tag')
task_def['scopes'].append(add_scope_prefix(config, 'treescript:action:tagging'))
if worker['bump']:
if not worker['bump-files']:
@ -1295,18 +1281,10 @@ def build_treescript_payload(config, task, task_def):
bump_info['next_version'] = release_config['next_version']
bump_info['files'] = worker['bump-files']
task_def['payload']['version_bump_info'] = bump_info
actions.append('version_bump')
if worker.get('l10n-bump-info'):
l10n_bump_info = {}
for k, v in worker['l10n-bump-info'].items():
l10n_bump_info[k.replace('-', '_')] = worker['l10n-bump-info'][k]
task_def['payload']['l10n_bump_info'] = [l10n_bump_info]
actions.append('l10n_bump')
task_def['scopes'].append(add_scope_prefix(config, 'treescript:action:version_bump'))
if worker['push']:
task_def['scopes'].append(add_scope_prefix(config, 'treescript:action:push'))
actions.append('push')
if worker.get('force-dry-run'):
task_def['payload']['dry_run'] = True
@ -1314,9 +1292,6 @@ def build_treescript_payload(config, task, task_def):
if worker.get('dontbuild'):
task_def['payload']['dontbuild'] = True
if worker.get('ignore-closed-tree') is not None:
task_def['payload']['ignore_closed_tree'] = worker['ignore-closed-tree']
@payload_builder('invalid', schema={
# an invalid task is one which should never actually be created; this is used in