Skip to content

Commit 413fd98

Browse files
author
Sandor Molnar
committed
Backed out changeset a9befcc1f72b (bug 1752111) for causint l10n bumper bustages on autoland.
1 parent 6916e07 commit 413fd98

File tree

14 files changed

+65
-98
lines changed

14 files changed

+65
-98
lines changed

.cron.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ jobs:
2929
- mozilla-central
3030
when:
3131
by-project:
32+
# `l10n-bumper` job should have enough time to finish before this
33+
# job runs
3234
mozilla-central: [{hour: 10, minute: 0}, {hour: 22, minute: 0}]
3335
# No default
3436

@@ -275,14 +277,12 @@ jobs:
275277
treeherder-symbol: l10n-bump
276278
target-tasks-method: l10n_bump
277279
run-on-projects:
278-
- autoland
279280
- mozilla-central
280281
- mozilla-beta
281282
when:
282283
by-project:
283284
# 3h15m before launch of `nightly-desktop`
284-
autoland: [{hour: 6, minute: 45}, {hour: 18, minute: 45}]
285-
mozilla-central: []
285+
mozilla-central: [{hour: 6, minute: 45}, {hour: 18, minute: 45}]
286286
# 3h15m before launch of `daily-releases`
287287
mozilla-beta: [{hour: 18, minute: 45}]
288288
# No default

taskcluster/ci/config.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -555,10 +555,7 @@ workers:
555555
worker-type:
556556
by-release-level:
557557
production: '{trust-domain}-3-tree'
558-
staging:
559-
by-project:
560-
autoland: '{trust-domain}-3-tree'
561-
default: '{trust-domain}-1-tree'
558+
staging: '{trust-domain}-1-tree'
562559
tree-dev:
563560
provisioner: scriptworker-k8s
564561
implementation: treescript

taskcluster/ci/l10n-bump/kind.yml

Lines changed: 37 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ transforms:
88
- gecko_taskgraph.transforms.release_version_bump:transforms
99
- gecko_taskgraph.transforms.task:transforms
1010

11+
1112
job-defaults:
1213
worker-type: tree
1314
worker:
@@ -18,20 +19,15 @@ job-defaults:
1819
by-project:
1920
mozilla-beta: false
2021
default: true
21-
ignore-closed-tree:
22-
by-project:
23-
autoland: true
24-
default: false
22+
ignore-closed-tree: false
2523
push:
2624
by-project:
2725
mozilla-(central|beta): true
28-
autoland: true
2926
default: false
3027
source-repo:
3128
by-release-type:
3229
beta: https://hg.mozilla.org/releases/mozilla-beta
33-
nightly: https://hg.mozilla.org/mozilla-central
34-
default: https://hg.mozilla.org/integration/autoland
30+
default: https://hg.mozilla.org/mozilla-central
3531
l10n-bump-info:
3632
by-release-type:
3733
# XXX whenever the `beta` config changes, make sure to make
@@ -56,27 +52,23 @@ job-defaults:
5652
- win64-devedition
5753
- win64-aarch64
5854
- win64-aarch64-devedition
59-
platform-configs:
60-
[
61-
{
62-
"platforms":
63-
[
64-
"linux",
65-
"linux-devedition",
66-
"linux64",
67-
"linux64-devedition",
68-
"macosx64",
69-
"macosx64-devedition",
70-
"win32",
71-
"win32-devedition",
72-
"win64",
73-
"win64-devedition",
74-
"win64-aarch64",
75-
"win64-aarch64-devedition",
76-
],
77-
"path": "browser/locales/shipped-locales",
78-
},
79-
]
55+
platform-configs: [{
56+
"platforms": [
57+
"linux",
58+
"linux-devedition",
59+
"linux64",
60+
"linux64-devedition",
61+
"macosx64",
62+
"macosx64-devedition",
63+
"win32",
64+
"win32-devedition",
65+
"win64",
66+
"win64-devedition",
67+
"win64-aarch64",
68+
"win64-aarch64-devedition",
69+
],
70+
"path": "browser/locales/shipped-locales",
71+
}]
8072
default:
8173
name: Firefox l10n changesets
8274
path: browser/locales/l10n-changesets.json
@@ -97,27 +89,23 @@ job-defaults:
9789
- win64-devedition
9890
- win64-aarch64
9991
- win64-aarch64-devedition
100-
platform-configs:
101-
[
102-
{
103-
"platforms":
104-
[
105-
"linux",
106-
"linux-devedition",
107-
"linux64",
108-
"linux64-devedition",
109-
"macosx64",
110-
"macosx64-devedition",
111-
"win32",
112-
"win32-devedition",
113-
"win64",
114-
"win64-devedition",
115-
"win64-aarch64",
116-
"win64-aarch64-devedition",
117-
],
118-
"path": "browser/locales/all-locales",
119-
},
120-
]
92+
platform-configs: [{
93+
"platforms": [
94+
"linux",
95+
"linux-devedition",
96+
"linux64",
97+
"linux64-devedition",
98+
"macosx64",
99+
"macosx64-devedition",
100+
"win32",
101+
"win32-devedition",
102+
"win64",
103+
"win64-devedition",
104+
"win64-aarch64",
105+
"win64-aarch64-devedition",
106+
],
107+
"path": "browser/locales/all-locales",
108+
}]
121109

122110
jobs:
123111
l10n-bumper:

taskcluster/gecko_taskgraph/config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
Required("implementation"): str,
108108
Required("os"): str,
109109
Required("worker-type"): optionally_keyed_by(
110-
"level", "release-level", "project", str
110+
"level", "release-level", str
111111
),
112112
}
113113
},

taskcluster/gecko_taskgraph/morph.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
from taskgraph.task import Task
3030
from taskgraph.taskgraph import TaskGraph
3131

32+
from .util.attributes import release_level
3233
from .util.workertypes import get_worker_type
3334

3435
here = os.path.abspath(os.path.dirname(__file__))
@@ -70,9 +71,7 @@ def derive_misc_task(
7071
image_taskid = label_to_taskid["docker-image-" + image]
7172

7273
provisioner_id, worker_type = get_worker_type(
73-
graph_config,
74-
parameters,
75-
"misc",
74+
graph_config, "misc", parameters["level"], release_level(parameters["project"])
7675
)
7776

7877
deps = copy.copy(dependencies)

taskcluster/gecko_taskgraph/test/test_transforms_job.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ def config():
4545
"head_repository": "http://hg.example.com",
4646
"head_rev": "abcdef",
4747
"level": 1,
48-
"project": "example",
4948
}
5049
)
5150
return TransformConfig(

taskcluster/gecko_taskgraph/transforms/build.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def set_defaults(config, jobs):
2727
job["treeherder"].setdefault("kind", "build")
2828
job["treeherder"].setdefault("tier", 1)
2929
_, worker_os = worker_type_implementation(
30-
config.graph_config, config.params, job["worker-type"]
30+
config.graph_config, job["worker-type"]
3131
)
3232
worker = job.setdefault("worker", {})
3333
worker.setdefault("env", {})
@@ -172,7 +172,7 @@ def use_profile_data(config, jobs):
172172
job["worker"]["env"].update({"TASKCLUSTER_PGO_PROFILE_USE": "1"})
173173

174174
_, worker_os = worker_type_implementation(
175-
config.graph_config, config.params, job["worker-type"]
175+
config.graph_config, job["worker-type"]
176176
)
177177
if worker_os == "linux":
178178
# LTO linkage needs more open files than the default from run-task.

taskcluster/gecko_taskgraph/transforms/job/__init__.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,7 @@ def rewrite_when_to_optimization(config, jobs):
134134
@transforms.add
135135
def set_implementation(config, jobs):
136136
for job in jobs:
137-
impl, os = worker_type_implementation(
138-
config.graph_config, config.params, job["worker-type"]
139-
)
137+
impl, os = worker_type_implementation(config.graph_config, job["worker-type"])
140138
if os:
141139
job.setdefault("tags", {})["os"] = os
142140
if impl:
@@ -166,7 +164,7 @@ def add_resource_monitor(config, jobs):
166164
for job in jobs:
167165
if job.get("attributes", {}).get("resource-monitor"):
168166
worker_implementation, worker_os = worker_type_implementation(
169-
config.graph_config, config.params, job["worker-type"]
167+
config.graph_config, job["worker-type"]
170168
)
171169
# Normalise worker os so that linux-bitbar and similar use linux tools.
172170
worker_os = worker_os.split("-")[0]

taskcluster/gecko_taskgraph/transforms/release_version_bump.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,7 @@ def handle_keyed_by(config, tasks):
2121
]
2222
for task in tasks:
2323
fields = default_fields[:]
24-
for additional_field in (
25-
"l10n-bump-info",
26-
"source-repo",
27-
"dontbuild",
28-
"ignore-closed-tree",
29-
):
24+
for additional_field in ("l10n-bump-info", "source-repo", "dontbuild"):
3025
if additional_field in task["worker"]:
3126
fields.append(f"worker.{additional_field}")
3227
for field in fields:

taskcluster/gecko_taskgraph/transforms/repackage.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ def make_job_description(config, jobs):
475475

476476
worker["artifacts"] = _generate_task_output_files(
477477
dep_job,
478-
worker_type_implementation(config.graph_config, config.params, worker_type),
478+
worker_type_implementation(config.graph_config, worker_type),
479479
repackage_config=repackage_config,
480480
locale=locale,
481481
)

0 commit comments

Comments
 (0)