Backed out changeset a9befcc1f72b (bug 1752111) for causint l10n bumper bustages on autoland.

.cron.yml

@@ -29,6 +29,8 @@ jobs:
           - mozilla-central
       when:
           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}]
               # No default
 
@@ -275,14 +277,12 @@ jobs:
           treeherder-symbol: l10n-bump
           target-tasks-method: l10n_bump
       run-on-projects:
-          - autoland
           - mozilla-central
           - mozilla-beta
       when:
           by-project:
               # 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`
               mozilla-beta: [{hour: 18, minute: 45}]
               # No default

taskcluster/ci/config.yml

@@ -555,10 +555,7 @@ workers:
             worker-type:
                 by-release-level:
                     production: '{trust-domain}-3-tree'
-                    staging:
+                    staging: '{trust-domain}-1-tree'
-                        by-project:
-                            autoland: '{trust-domain}-3-tree'
-                            default: '{trust-domain}-1-tree'
         tree-dev:
             provisioner: scriptworker-k8s
             implementation: treescript

taskcluster/ci/l10n-bump/kind.yml

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

taskcluster/gecko_taskgraph/config.py

@@ -107,7 +107,7 @@ graph_config_schema = Schema(
                     Required("implementation"): str,
                     Required("os"): str,
                     Required("worker-type"): optionally_keyed_by(
-                        "level", "release-level", "project", str
+                        "level", "release-level", str
                     ),
                 }
             },

taskcluster/gecko_taskgraph/morph.py

@@ -29,6 +29,7 @@ from taskgraph.graph import Graph
 from taskgraph.task import Task
 from taskgraph.taskgraph import TaskGraph
 
+from .util.attributes import release_level
 from .util.workertypes import get_worker_type
 
 here = os.path.abspath(os.path.dirname(__file__))
@@ -70,9 +71,7 @@ def derive_misc_task(
     image_taskid = label_to_taskid["docker-image-" + image]
 
     provisioner_id, worker_type = get_worker_type(
-        graph_config,
+        graph_config, "misc", parameters["level"], release_level(parameters["project"])
-        parameters,
-        "misc",
     )
 
     deps = copy.copy(dependencies)

taskcluster/gecko_taskgraph/test/test_transforms_job.py

@@ -45,7 +45,6 @@ def config():
             "head_repository": "http://hg.example.com",
             "head_rev": "abcdef",
             "level": 1,
-            "project": "example",
         }
     )
     return TransformConfig(

taskcluster/gecko_taskgraph/transforms/build.py

@@ -27,7 +27,7 @@ def set_defaults(config, jobs):
         job["treeherder"].setdefault("kind", "build")
         job["treeherder"].setdefault("tier", 1)
         _, worker_os = worker_type_implementation(
-            config.graph_config, config.params, job["worker-type"]
+            config.graph_config, job["worker-type"]
         )
         worker = job.setdefault("worker", {})
         worker.setdefault("env", {})
@@ -172,7 +172,7 @@ def use_profile_data(config, jobs):
         job["worker"]["env"].update({"TASKCLUSTER_PGO_PROFILE_USE": "1"})
 
         _, worker_os = worker_type_implementation(
-            config.graph_config, config.params, job["worker-type"]
+            config.graph_config, job["worker-type"]
         )
         if worker_os == "linux":
             # LTO linkage needs more open files than the default from run-task.

taskcluster/gecko_taskgraph/transforms/job/__init__.py

@@ -134,9 +134,7 @@ def rewrite_when_to_optimization(config, jobs):
 @transforms.add
 def set_implementation(config, jobs):
     for job in jobs:
-        impl, os = worker_type_implementation(
+        impl, os = worker_type_implementation(config.graph_config, job["worker-type"])
-            config.graph_config, config.params, job["worker-type"]
-        )
         if os:
             job.setdefault("tags", {})["os"] = os
         if impl:
@@ -166,7 +164,7 @@ def add_resource_monitor(config, jobs):
     for job in jobs:
         if job.get("attributes", {}).get("resource-monitor"):
             worker_implementation, worker_os = worker_type_implementation(
-                config.graph_config, config.params, job["worker-type"]
+                config.graph_config, job["worker-type"]
             )
             # Normalise worker os so that linux-bitbar and similar use linux tools.
             worker_os = worker_os.split("-")[0]

taskcluster/gecko_taskgraph/transforms/release_version_bump.py

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

taskcluster/gecko_taskgraph/transforms/repackage.py

@@ -475,7 +475,7 @@ def make_job_description(config, jobs):
 
         worker["artifacts"] = _generate_task_output_files(
             dep_job,
-            worker_type_implementation(config.graph_config, config.params, worker_type),
+            worker_type_implementation(config.graph_config, worker_type),
             repackage_config=repackage_config,
             locale=locale,
         )

taskcluster/gecko_taskgraph/transforms/repackage_partner.py

@@ -177,7 +177,7 @@ def make_job_description(config, jobs):
 
         worker["artifacts"] = _generate_task_output_files(
             dep_job,
-            worker_type_implementation(config.graph_config, config.params, worker_type),
+            worker_type_implementation(config.graph_config, worker_type),
             repackage_config,
             partner=repack_id,
         )

taskcluster/gecko_taskgraph/transforms/task.py

@@ -1446,9 +1446,7 @@ def set_implementation(config, tasks):
             yield task
             continue
 
-        impl, os = worker_type_implementation(
+        impl, os = worker_type_implementation(config.graph_config, task["worker-type"])
-            config.graph_config, config.params, task["worker-type"]
-        )
 
         tags = task.setdefault("tags", {})
         tags["worker-implementation"] = impl
@@ -1859,8 +1857,9 @@ def build_task(config, tasks):
         else:
             provisioner_id, worker_type = get_worker_type(
                 config.graph_config,
-                config.params,
                 task["worker-type"],
+                level=level,
+                release_level=release_level(config.params["project"]),
             )
         task["worker-type"] = "/".join([provisioner_id, worker_type])
         project = config.params["project"]

taskcluster/gecko_taskgraph/util/workertypes.py

@@ -2,7 +2,7 @@
 # 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 gecko_taskgraph.util.attributes import release_level as _release_level
+
 from mozbuild.util import memoize
 from taskgraph.util.attributes import keymatch
 from taskgraph.util.keyed_by import evaluate_keyed_by
@@ -20,7 +20,7 @@ WORKER_TYPES = {
 
 
 @memoize
-def _get(graph_config, alias, level, release_level, project):
+def _get(graph_config, alias, level, release_level):
     """Get the configuration for this worker_type alias: {provisioner,
     worker-type, implementation, os}"""
     level = str(level)
@@ -61,13 +61,10 @@ def _get(graph_config, alias, level, release_level, project):
             "alias": alias,
         }
     )
-    attrs = {"level": level, "release-level": release_level}
-    if project:
-        attrs["project"] = project
     worker_config["worker-type"] = evaluate_keyed_by(
         worker_config["worker-type"],
         f"worker-type alias {alias} field worker-type",
-        attrs,
+        {"level": level, "release-level": release_level},
     ).format(
         **{
             "trust-domain": graph_config["trust-domain"],
@@ -79,26 +76,18 @@ def _get(graph_config, alias, level, release_level, project):
     return worker_config
 
 
-def worker_type_implementation(graph_config, parameters, worker_type):
+def worker_type_implementation(graph_config, worker_type):
     """Get the worker implementation and OS for the given workerType, where the
     OS represents the host system, not the target OS, in the case of
     cross-compiles."""
-    worker_config = _get(
+    worker_config = _get(graph_config, worker_type, "1", "staging")
-        graph_config, worker_type, "1", "staging", parameters["project"]
-    )
     return worker_config["implementation"], worker_config.get("os")
 
 
-def get_worker_type(graph_config, parameters, worker_type):
+def get_worker_type(graph_config, worker_type, level, release_level):
     """
     Get the worker type provisioner and worker-type, optionally evaluating
     aliases from the graph config.
     """
-    worker_config = _get(
+    worker_config = _get(graph_config, worker_type, level, release_level)
-        graph_config,
-        worker_type,
-        parameters["level"],
-        _release_level(parameters.get("project")),
-        parameters.get("project"),
-    )
     return worker_config["provisioner"], worker_config["worker-type"]

tools/tryselect/task_config.py

@@ -505,7 +505,10 @@ class WorkerOverrides(TryConfig):
                     )
                     sys.exit(1)
                 provisioner, worker_type = get_worker_type(
-                    graph_config, worker_type=alias, parameters={"level": "1"}
+                    graph_config,
+                    alias,
+                    level="1",
+                    release_level="staging",
                 )
                 overrides[alias] = "{provisioner}/{worker_type}{suffix}".format(
                     provisioner=provisioner, worker_type=worker_type, suffix=suffix