Backed out changeset 06e2145b5a21 (bug 1752111) for causing linting failures on release_version_bump.py. CLOSED TREE

This commit is contained in:
Iulian Moraru 2022-08-11 21:02:09 +03:00
parent 2cc5606cfe
commit 38125e0515
3 changed files with 41 additions and 53 deletions

View file

@ -29,6 +29,8 @@ jobs:
- mozilla-central - mozilla-central
when: when:
by-project: by-project:
# `l10n-bumper` job should have enough time to finish before this
# job runs
mozilla-central: [{hour: 10, minute: 0}, {hour: 22, minute: 0}] mozilla-central: [{hour: 10, minute: 0}, {hour: 22, minute: 0}]
# No default # No default
@ -275,14 +277,12 @@ jobs:
treeherder-symbol: l10n-bump treeherder-symbol: l10n-bump
target-tasks-method: l10n_bump target-tasks-method: l10n_bump
run-on-projects: run-on-projects:
- autoland
- mozilla-central - mozilla-central
- mozilla-beta - mozilla-beta
when: when:
by-project: by-project:
# 3h15m before launch of `nightly-desktop` # 3h15m before launch of `nightly-desktop`
autoland: [{hour: 6, minute: 45}, {hour: 18, minute: 45}] mozilla-central: [{hour: 6, minute: 45}, {hour: 18, minute: 45}]
mozilla-central: []
# 3h15m before launch of `daily-releases` # 3h15m before launch of `daily-releases`
mozilla-beta: [{hour: 18, minute: 45}] mozilla-beta: [{hour: 18, minute: 45}]
# No default # No default

View file

@ -8,6 +8,7 @@ transforms:
- gecko_taskgraph.transforms.release_version_bump:transforms - gecko_taskgraph.transforms.release_version_bump:transforms
- gecko_taskgraph.transforms.task:transforms - gecko_taskgraph.transforms.task:transforms
job-defaults: job-defaults:
worker-type: tree worker-type: tree
worker: worker:
@ -18,20 +19,15 @@ job-defaults:
by-project: by-project:
mozilla-beta: false mozilla-beta: false
default: true default: true
ignore-closed-tree: ignore-closed-tree: false
by-project:
autoland: true
default: false
push: push:
by-project: by-project:
mozilla-(central|beta): true mozilla-(central|beta): true
autoland: true
default: false default: false
source-repo: source-repo:
by-release-type: by-release-type:
beta: https://hg.mozilla.org/releases/mozilla-beta beta: https://hg.mozilla.org/releases/mozilla-beta
nightly: https://hg.mozilla.org/mozilla-central default: https://hg.mozilla.org/mozilla-central
default: https://hg.mozilla.org/integration/autoland
l10n-bump-info: l10n-bump-info:
by-release-type: by-release-type:
# XXX whenever the `beta` config changes, make sure to make # XXX whenever the `beta` config changes, make sure to make
@ -56,11 +52,8 @@ job-defaults:
- win64-devedition - win64-devedition
- win64-aarch64 - win64-aarch64
- win64-aarch64-devedition - win64-aarch64-devedition
platform-configs: platform-configs: [{
[ "platforms": [
{
"platforms":
[
"linux", "linux",
"linux-devedition", "linux-devedition",
"linux64", "linux64",
@ -75,8 +68,7 @@ job-defaults:
"win64-aarch64-devedition", "win64-aarch64-devedition",
], ],
"path": "browser/locales/shipped-locales", "path": "browser/locales/shipped-locales",
}, }]
]
default: default:
name: Firefox l10n changesets name: Firefox l10n changesets
path: browser/locales/l10n-changesets.json path: browser/locales/l10n-changesets.json
@ -97,11 +89,8 @@ job-defaults:
- win64-devedition - win64-devedition
- win64-aarch64 - win64-aarch64
- win64-aarch64-devedition - win64-aarch64-devedition
platform-configs: platform-configs: [{
[ "platforms": [
{
"platforms":
[
"linux", "linux",
"linux-devedition", "linux-devedition",
"linux64", "linux64",
@ -116,8 +105,7 @@ job-defaults:
"win64-aarch64-devedition", "win64-aarch64-devedition",
], ],
"path": "browser/locales/all-locales", "path": "browser/locales/all-locales",
}, }]
]
jobs: jobs:
l10n-bumper: l10n-bumper:

View file

@ -21,7 +21,7 @@ def handle_keyed_by(config, tasks):
] ]
for task in tasks: for task in tasks:
fields = default_fields[:] fields = default_fields[:]
for additional_field in ("l10n-bump-info", "source-repo", "dontbuild", "ignore-closed-tree"): for additional_field in ("l10n-bump-info", "source-repo", "dontbuild"):
if additional_field in task["worker"]: if additional_field in task["worker"]:
fields.append(f"worker.{additional_field}") fields.append(f"worker.{additional_field}")
for field in fields: for field in fields: