Bug 1901281 - [ci] Use upstream Taskgraph's transform loader, r=taskgraph-reviewers,releng-reviewers,bhearsum

Differential Revision: https://phabricator.services.mozilla.com/D213429

taskcluster/android_taskgraph/loader/build_config.py

@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-from gecko_taskgraph.loader.transform import loader as base_loader
+from taskgraph.loader.transform import loader as base_loader
 from taskgraph.util.templates import merge
 
 from ..build_config import get_apk_based_projects, get_components
@@ -14,7 +14,7 @@ def components_loader(kind, path, config, params, loaded_tasks):
 
     Android-components are read from android-component/.buildconfig.yml
     """
-    config["jobs"] = _get_components_tasks(config)
+    config["tasks"] = _get_components_tasks(config)
     return base_loader(kind, path, config, params, loaded_tasks)
 
 
@@ -24,12 +24,12 @@ def components_and_apks_loader(kind, path, config, params, loaded_tasks):
     For instance focus-android yields one task.
     Config is read from various .buildconfig.yml files.
 
-    Additional tasks can be provided in the kind.yml under the key `jobs`.
+    Additional tasks can be provided in the kind.yml under the key `tasks`.
     """
 
     components_tasks = _get_components_tasks(config, for_build_type="regular")
     apks_tasks = _get_apks_tasks(config)
-    config["jobs"] = merge(config["jobs"], components_tasks, apks_tasks)
+    config["tasks"] = merge(config["tasks"], components_tasks, apks_tasks)
     return base_loader(kind, path, config, params, loaded_tasks)
 
 

taskcluster/gecko_taskgraph/loader/test.py

@@ -5,11 +5,10 @@
 
 import logging
 
+from taskgraph.loader.transform import loader as transform_loader
 from taskgraph.util.copy import deepcopy
 from taskgraph.util.yaml import load_yaml
 
-from .transform import loader as transform_loader
-
 logger = logging.getLogger(__name__)
 
 

taskcluster/gecko_taskgraph/loader/transform.py

@@ -1,58 +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/.
-
-
-import logging
-
-from taskgraph.util.templates import merge
-from taskgraph.util.yaml import load_yaml
-
-logger = logging.getLogger(__name__)
-
-
-def loader(kind, path, config, params, loaded_tasks):
-    """
-    Get the input elements that will be transformed into tasks in a generic
-    way.  The elements themselves are free-form, and become the input to the
-    first transform.
-
-    By default, this reads jobs from the `jobs` key, or from yaml files
-    named by `jobs-from`.  The entities are read from mappings, and the
-    keys to those mappings are added in the `name` key of each entity.
-
-    If there is a `job-defaults` config, then every job is merged with it.
-    This provides a simple way to set default values for all jobs of a kind.
-    The `job-defaults` key can also be specified in a yaml file pointed to by
-    `jobs-from`. In this case it will only apply to tasks defined in the same
-    file.
-
-    Other kind implementations can use a different loader function to
-    produce inputs and hand them to `transform_inputs`.
-    """
-
-    def jobs():
-        defaults = config.get("job-defaults")
-        for name, job in config.get("jobs", {}).items():
-            if defaults:
-                job = merge(defaults, job)
-            job["job-from"] = "kind.yml"
-            yield name, job
-
-        for filename in config.get("jobs-from", []):
-            tasks = load_yaml(path, filename)
-
-            file_defaults = tasks.pop("job-defaults", None)
-            if defaults:
-                file_defaults = merge(defaults, file_defaults or {})
-
-            for name, job in tasks.items():
-                if file_defaults:
-                    job = merge(file_defaults, job)
-                job["job-from"] = filename
-                yield name, job
-
-    for name, job in jobs():
-        job["name"] = name
-        logger.debug(f"Generating tasks for {kind} {name}")
-        yield job

taskcluster/gecko_taskgraph/test/conftest.py

@@ -74,8 +74,8 @@ def fake_loader(kind, path, config, parameters, loaded_tasks):
             },
             "dependencies": dependencies,
         }
-        if "job-defaults" in config:
-            task = merge(config["job-defaults"], task)
+        if "task-defaults" in config:
+            task = merge(config["task-defaults"], task)
         yield task
 
 

taskcluster/gecko_taskgraph/transforms/balrog_submit.py

@@ -28,7 +28,7 @@ balrog_description_schema = Schema(
         Optional("treeherder"): task_description_schema["treeherder"],
         Optional("attributes"): task_description_schema["attributes"],
         Optional("dependencies"): task_description_schema["dependencies"],
-        Optional("job-from"): task_description_schema["job-from"],
+        Optional("task-from"): task_description_schema["task-from"],
         # Shipping product / phase
         Optional("shipping-product"): task_description_schema["shipping-product"],
         Optional("shipping-phase"): task_description_schema["shipping-phase"],

taskcluster/gecko_taskgraph/transforms/beetmover.py

@@ -36,7 +36,7 @@ beetmover_description_schema = Schema(
         Required("shipping-phase"): task_description_schema["shipping-phase"],
         Optional("shipping-product"): task_description_schema["shipping-product"],
         Optional("attributes"): task_description_schema["attributes"],
-        Optional("job-from"): task_description_schema["job-from"],
+        Optional("task-from"): task_description_schema["task-from"],
     }
 )
 

taskcluster/gecko_taskgraph/transforms/beetmover_checksums.py

@@ -30,7 +30,7 @@ beetmover_checksums_description_schema = Schema(
         Optional("locale"): str,
         Optional("shipping-phase"): task_description_schema["shipping-phase"],
         Optional("shipping-product"): task_description_schema["shipping-product"],
-        Optional("job-from"): task_description_schema["job-from"],
+        Optional("task-from"): task_description_schema["task-from"],
     }
 )
 

taskcluster/gecko_taskgraph/transforms/beetmover_emefree_checksums.py

@@ -20,7 +20,7 @@ beetmover_checksums_description_schema = Schema(
         Optional("extra"): object,
         Optional("shipping-phase"): task_description_schema["shipping-phase"],
         Optional("shipping-product"): task_description_schema["shipping-product"],
-        Optional("job-from"): task_description_schema["job-from"],
+        Optional("task-from"): task_description_schema["task-from"],
         Optional("attributes"): task_description_schema["attributes"],
         Optional("dependencies"): task_description_schema["dependencies"],
     }

taskcluster/gecko_taskgraph/transforms/beetmover_geckoview.py

@@ -40,7 +40,7 @@ beetmover_description_schema = Schema(
         ),
         Optional("shipping-product"): task_description_schema["shipping-product"],
         Optional("attributes"): task_description_schema["attributes"],
-        Optional("job-from"): task_description_schema["job-from"],
+        Optional("task-from"): task_description_schema["task-from"],
     }
 )
 

taskcluster/gecko_taskgraph/transforms/beetmover_langpack_checksums.py

@@ -28,7 +28,7 @@ beetmover_checksums_description_schema = Schema(
         Optional("treeherder"): task_description_schema["treeherder"],
         Optional("locale"): str,
         Optional("dependencies"): task_description_schema["dependencies"],
-        Optional("job-from"): task_description_schema["job-from"],
+        Optional("task-from"): task_description_schema["task-from"],
         Optional("shipping-phase"): task_description_schema["shipping-phase"],
         Optional("shipping-product"): task_description_schema["shipping-product"],
     }

taskcluster/gecko_taskgraph/transforms/beetmover_push_to_release.py

@@ -21,7 +21,7 @@ beetmover_push_to_release_description_schema = Schema(
         Required("product"): str,
         Required("treeherder-platform"): str,
         Optional("attributes"): {str: object},
-        Optional("job-from"): task_description_schema["job-from"],
+        Optional("task-from"): task_description_schema["task-from"],
         Optional("run"): {str: object},
         Optional("run-on-projects"): task_description_schema["run-on-projects"],
         Optional("dependencies"): {str: taskref_or_string},

taskcluster/gecko_taskgraph/transforms/beetmover_repackage.py

@@ -50,7 +50,7 @@ beetmover_description_schema = Schema(
         # locale is passed only for l10n beetmoving
         Optional("locale"): str,
         Required("shipping-phase"): task_description_schema["shipping-phase"],
-        Optional("job-from"): task_description_schema["job-from"],
+        Optional("task-from"): task_description_schema["task-from"],
     }
 )
 

taskcluster/gecko_taskgraph/transforms/beetmover_repackage_partner.py

@@ -38,7 +38,7 @@ beetmover_description_schema = Schema(
         Required("shipping-phase"): task_description_schema["shipping-phase"],
         Optional("shipping-product"): task_description_schema["shipping-product"],
         Optional("priority"): task_description_schema["priority"],
-        Optional("job-from"): task_description_schema["job-from"],
+        Optional("task-from"): task_description_schema["task-from"],
     }
 )
 

taskcluster/gecko_taskgraph/transforms/beetmover_source_checksums.py

@@ -29,7 +29,7 @@ beetmover_checksums_description_schema = Schema(
         Optional("shipping-product"): task_description_schema["shipping-product"],
         Optional("attributes"): task_description_schema["attributes"],
         Optional("dependencies"): task_description_schema["dependencies"],
-        Optional("job-from"): task_description_schema["job-from"],
+        Optional("task-from"): task_description_schema["task-from"],
     }
 )
 

taskcluster/gecko_taskgraph/transforms/bootstrap.py

@@ -20,7 +20,7 @@ bootstrap_schema = Schema(
         # Initialization commands.
         Required("pre-commands"): [str],
         # relative path (from config.path) to the file task was defined in
-        Optional("job-from"): str,
+        Optional("task-from"): str,
     }
 )
 

taskcluster/gecko_taskgraph/transforms/condprof.py

@@ -22,7 +22,7 @@ diff_description_schema = Schema(
         Optional("dependencies"): task_description_schema["dependencies"],
         Optional("fetches"): job_description_schema["fetches"],
         Optional("index"): task_description_schema["index"],
-        Optional("job-from"): str,
+        Optional("task-from"): str,
         Optional("name"): str,
         Optional("run"): job_description_schema["run"],
         Optional("run-on-projects"): task_description_schema["run-on-projects"],

taskcluster/gecko_taskgraph/transforms/diffoscope.py

@@ -27,11 +27,11 @@ diff_description_schema = Schema(
         # Treeherder symbol.
         Required("symbol"): str,
         # relative path (from config.path) to the file the task was defined in.
-        Optional("job-from"): str,
+        Optional("task-from"): str,
         # Original and new builds to compare.
         Required("original"): index_or_string,
         Required("new"): index_or_string,
-        # Arguments to pass to diffoscope, used for job-defaults in
+        # Arguments to pass to diffoscope, used for task-defaults in
         # taskcluster/kinds/diffoscope/kind.yml
         Optional("args"): str,
         # Extra arguments to pass to diffoscope, that can be set per job.

taskcluster/gecko_taskgraph/transforms/docker_image.py

@@ -47,7 +47,7 @@ docker_image_schema = Schema(
         Required("symbol"): str,
         # relative path (from config.path) to the file the docker image was defined
         # in.
-        Optional("job-from"): str,
+        Optional("task-from"): str,
         # Arguments to use for the Dockerfile.
         Optional("args"): {str: str},
         # Name of the docker image definition under taskcluster/docker, when

taskcluster/gecko_taskgraph/transforms/fetch.py

@@ -30,7 +30,7 @@ FETCH_SCHEMA = Schema(
         Required("name"): str,
         # Relative path (from config.path) to the file the task was defined
         # in.
-        Optional("job-from"): str,
+        Optional("task-from"): str,
         # Description of the task.
         Required("description"): str,
         Optional(

taskcluster/gecko_taskgraph/transforms/geckodriver_mac_notarization.py

@@ -21,7 +21,7 @@ geckodriver_notarization_description_schema = Schema(
         Optional("shipping-phase"): task_description_schema["shipping-phase"],
         Optional("worker"): task_description_schema["worker"],
         Optional("worker-type"): task_description_schema["worker-type"],
-        Optional("job-from"): task_description_schema["job-from"],
+        Optional("task-from"): task_description_schema["task-from"],
         Optional("attributes"): task_description_schema["attributes"],
         Optional("dependencies"): task_description_schema["dependencies"],
     }

taskcluster/gecko_taskgraph/transforms/geckodriver_signing.py

@@ -21,7 +21,7 @@ repackage_signing_description_schema = Schema(
         Optional("dependencies"): task_description_schema["dependencies"],
         Optional("treeherder"): task_description_schema["treeherder"],
         Optional("shipping-phase"): task_description_schema["shipping-phase"],
-        Optional("job-from"): task_description_schema["job-from"],
+        Optional("task-from"): task_description_schema["task-from"],
     }
 )
 

taskcluster/gecko_taskgraph/transforms/job/__init__.py

@@ -41,7 +41,7 @@ job_description_schema = Schema(
         # taskcluster/gecko_taskgraph/transforms/task.py for the schema details.
         Required("description"): task_description_schema["description"],
         Optional("attributes"): task_description_schema["attributes"],
-        Optional("job-from"): task_description_schema["job-from"],
+        Optional("task-from"): task_description_schema["task-from"],
         Optional("dependencies"): task_description_schema["dependencies"],
         Optional("if-dependencies"): task_description_schema["if-dependencies"],
         Optional("soft-dependencies"): task_description_schema["soft-dependencies"],

taskcluster/gecko_taskgraph/transforms/l10n.py

@@ -119,7 +119,7 @@ l10n_description_schema = Schema(
         # Shipping product and phase
         Optional("shipping-product"): task_description_schema["shipping-product"],
         Optional("shipping-phase"): task_description_schema["shipping-phase"],
-        Optional("job-from"): task_description_schema["job-from"],
+        Optional("task-from"): task_description_schema["task-from"],
     }
 )
 

taskcluster/gecko_taskgraph/transforms/openh264_signing.py

@@ -25,7 +25,7 @@ signing_description_schema = Schema(
         Optional("shipping-phase"): task_description_schema["shipping-phase"],
         Optional("attributes"): task_description_schema["attributes"],
         Optional("dependencies"): task_description_schema["dependencies"],
-        Optional("job-from"): task_description_schema["job-from"],
+        Optional("task-from"): task_description_schema["task-from"],
     }
 )
 

taskcluster/gecko_taskgraph/transforms/partner_attribution_beetmover.py

@@ -27,7 +27,7 @@ from gecko_taskgraph.util.scriptworker import (
 beetmover_description_schema = Schema(
     {
         # from the loader:
-        Optional("job-from"): str,
+        Optional("task-from"): str,
         Optional("name"): str,
         # from the from_deps transforms:
         Optional("attributes"): task_description_schema["attributes"],

taskcluster/gecko_taskgraph/transforms/release_beetmover_signed_addons.py

@@ -49,7 +49,7 @@ beetmover_description_schema = Schema(
         # locale is passed only for l10n beetmoving
         Optional("locale"): str,
         Optional("shipping-phase"): task_description_schema["shipping-phase"],
-        Optional("job-from"): task_description_schema["job-from"],
+        Optional("task-from"): task_description_schema["task-from"],
         Optional("dependencies"): task_description_schema["dependencies"],
     }
 )

taskcluster/gecko_taskgraph/transforms/release_flatpak_push.py

@@ -16,7 +16,7 @@ from gecko_taskgraph.util.scriptworker import add_scope_prefix
 push_flatpak_description_schema = Schema(
     {
         Required("name"): str,
-        Required("job-from"): task_description_schema["job-from"],
+        Required("task-from"): task_description_schema["task-from"],
         Required("dependencies"): task_description_schema["dependencies"],
         Required("description"): task_description_schema["description"],
         Required("treeherder"): task_description_schema["treeherder"],

taskcluster/gecko_taskgraph/transforms/release_generate_checksums_beetmover.py

@@ -34,7 +34,7 @@ release_generate_checksums_beetmover_schema = Schema(
         Optional("shipping-phase"): task_description_schema["shipping-phase"],
         Optional("shipping-product"): task_description_schema["shipping-product"],
         Optional("attributes"): task_description_schema["attributes"],
-        Optional("job-from"): task_description_schema["job-from"],
+        Optional("task-from"): task_description_schema["task-from"],
         Optional("dependencies"): task_description_schema["dependencies"],
     }
 )

taskcluster/gecko_taskgraph/transforms/release_generate_checksums_signing.py

@@ -23,7 +23,7 @@ release_generate_checksums_signing_schema = Schema(
         Optional("treeherder"): task_description_schema["treeherder"],
         Optional("shipping-product"): task_description_schema["shipping-product"],
         Optional("shipping-phase"): task_description_schema["shipping-phase"],
-        Optional("job-from"): task_description_schema["job-from"],
+        Optional("task-from"): task_description_schema["task-from"],
     }
 )
 

taskcluster/gecko_taskgraph/transforms/release_msix_push.py

@@ -16,7 +16,7 @@ from gecko_taskgraph.util.scriptworker import add_scope_prefix
 push_msix_description_schema = Schema(
     {
         Required("name"): str,
-        Required("job-from"): task_description_schema["job-from"],
+        Required("task-from"): task_description_schema["task-from"],
         Required("dependencies"): task_description_schema["dependencies"],
         Required("description"): task_description_schema["description"],
         Required("treeherder"): task_description_schema["treeherder"],

taskcluster/gecko_taskgraph/transforms/release_sign_and_push_langpacks.py

@@ -33,7 +33,7 @@ langpack_sign_push_description_schema = Schema(
         Required("run-on-projects"): [],
         Required("scopes"): optionally_keyed_by("release-level", [str]),
         Required("shipping-phase"): task_description_schema["shipping-phase"],
-        Optional("job-from"): task_description_schema["job-from"],
+        Optional("task-from"): task_description_schema["task-from"],
         Optional("attributes"): task_description_schema["attributes"],
         Optional("dependencies"): task_description_schema["dependencies"],
     }

taskcluster/gecko_taskgraph/transforms/repackage.py

@@ -93,7 +93,7 @@ packaging_description_schema = Schema(
             Optional("run-as-root"): bool,
             Optional("use-caches"): bool,
         },
-        Optional("job-from"): job_description_schema["job-from"],
+        Optional("task-from"): job_description_schema["task-from"],
     }
 )
 

taskcluster/gecko_taskgraph/transforms/repackage_partner.py

@@ -56,7 +56,7 @@ packaging_description_schema = Schema(
         },
         # Override the default priority for the project
         Optional("priority"): task_description_schema["priority"],
-        Optional("job-from"): task_description_schema["job-from"],
+        Optional("task-from"): task_description_schema["task-from"],
         Optional("attributes"): task_description_schema["attributes"],
         Optional("dependencies"): task_description_schema["dependencies"],
     }

taskcluster/gecko_taskgraph/transforms/repackage_signing.py

@@ -21,7 +21,7 @@ repackage_signing_description_schema = Schema(
         Optional("label"): str,
         Optional("attributes"): task_description_schema["attributes"],
         Optional("dependencies"): task_description_schema["dependencies"],
-        Optional("job-from"): task_description_schema["job-from"],
+        Optional("task-from"): task_description_schema["task-from"],
         Optional("treeherder"): task_description_schema["treeherder"],
         Optional("shipping-product"): task_description_schema["shipping-product"],
         Optional("shipping-phase"): task_description_schema["shipping-phase"],

taskcluster/gecko_taskgraph/transforms/repackage_signing_partner.py

@@ -27,7 +27,7 @@ repackage_signing_description_schema = Schema(
         Optional("shipping-product"): task_description_schema["shipping-product"],
         Optional("shipping-phase"): task_description_schema["shipping-phase"],
         Optional("priority"): task_description_schema["priority"],
-        Optional("job-from"): task_description_schema["job-from"],
+        Optional("task-from"): task_description_schema["task-from"],
     }
 )
 

taskcluster/gecko_taskgraph/transforms/signing.py

@@ -56,7 +56,7 @@ signing_description_schema = Schema(
         Optional("repacks-per-chunk"): int,
         # Override the default priority for the project
         Optional("priority"): task_description_schema["priority"],
-        Optional("job-from"): task_description_schema["job-from"],
+        Optional("task-from"): task_description_schema["task-from"],
     }
 )
 

taskcluster/gecko_taskgraph/transforms/source_checksums_signing.py

@@ -20,7 +20,7 @@ checksums_signing_description_schema = Schema(
         Optional("treeherder"): task_description_schema["treeherder"],
         Optional("shipping-product"): task_description_schema["shipping-product"],
         Optional("shipping-phase"): task_description_schema["shipping-phase"],
-        Optional("job-from"): task_description_schema["job-from"],
+        Optional("task-from"): task_description_schema["task-from"],
         Optional("attributes"): task_description_schema["attributes"],
         Optional("dependencies"): task_description_schema["dependencies"],
     }

taskcluster/gecko_taskgraph/transforms/source_test.py

@@ -63,8 +63,8 @@ transforms.add_validate(source_test_description_schema)
 @transforms.add
 def set_job_name(config, jobs):
     for job in jobs:
-        if "job-from" in job and job["job-from"] != "kind.yml":
-            from_name = os.path.splitext(job["job-from"])[0]
+        if "task-from" in job and job["task-from"] != "kind.yml":
+            from_name = os.path.splitext(job["task-from"])[0]
             job["name"] = "{}-{}".format(from_name, job["name"])
         yield job
 

taskcluster/gecko_taskgraph/transforms/task.py

@@ -71,7 +71,7 @@ task_description_schema = Schema(
         # attributes for this task
         Optional("attributes"): {str: object},
         # relative path (from config.path) to the file task was defined in
-        Optional("job-from"): str,
+        Optional("task-from"): str,
         # dependencies of this task, keyed by name; these are passed through
         # verbatim and subject to the interpretation of the Task's get_dependencies
         # method.
@@ -2006,7 +2006,7 @@ def build_task(config, tasks):
             if groupSymbol != "?":
                 treeherder["groupSymbol"] = groupSymbol
                 if groupSymbol not in group_names:
-                    path = os.path.join(config.path, task.get("job-from", ""))
+                    path = os.path.join(config.path, task.get("task-from", ""))
                     raise Exception(UNKNOWN_GROUP_NAME.format(groupSymbol, path))
                 treeherder["groupName"] = group_names[groupSymbol]
             treeherder["symbol"] = symbol

taskcluster/gecko_taskgraph/transforms/test/__init__.py

@@ -75,7 +75,7 @@ test_description_schema = Schema(
         # common attributes)
         Optional("attributes"): {str: object},
         # relative path (from config.path) to the file task was defined in
-        Optional("job-from"): str,
+        Optional("task-from"): str,
         # The `run_on_projects` attribute, defaulting to "all".  This dictates the
         # projects on which this task should be included in the target task set.
         # See the attributes documentation for details.
@@ -485,7 +485,7 @@ def make_job_description(config, tasks):
         jobdesc["description"] = task["description"]
         jobdesc["attributes"] = attributes
         jobdesc["dependencies"] = {"build": build_label}
-        jobdesc["job-from"] = task["job-from"]
+        jobdesc["task-from"] = task["task-from"]
 
         if task.get("fetches"):
             jobdesc["fetches"] = task["fetches"]

taskcluster/gecko_taskgraph/util/docker.py

@@ -272,7 +272,7 @@ class ImagePathsMap(Mapping):
 
     def __init__(self, config_path, image_dir=IMAGE_DIR):
         config = load_yaml(GECKO, config_path)
-        self.__update_image_paths(config["jobs"], image_dir)
+        self.__update_image_paths(config["tasks"], image_dir)
 
     def __getitem__(self, key):
         return self.__dict__[key]

taskcluster/kinds/addon/kind.yml

@@ -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/.
 ---
-loader: gecko_taskgraph.loader.transform:loader
+loader: taskgraph.loader.transform:loader
 
 kind-dependencies:
     # non-system python
@@ -12,10 +12,10 @@ transforms:
     - gecko_taskgraph.transforms.job:transforms
     - gecko_taskgraph.transforms.task:transforms
 
-job-defaults:
+task-defaults:
     use-python: default
 
-jobs:
+tasks:
     tps-xpi:
         description: Build the TPS add-on
         index:

taskcluster/kinds/android-l10n/kind.yml

@@ -2,12 +2,12 @@
 # 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: gecko_taskgraph.loader.transform:loader
+loader: taskgraph.loader.transform:loader
 
 transforms:
     - gecko_taskgraph.transforms.task:transforms
 
-job-defaults:
+task-defaults:
     run-on-projects: []
     treeherder:
         kind: build
@@ -21,7 +21,7 @@ job-defaults:
         dontbuild: false
         push: true
 
-jobs:
+tasks:
     import:
         name: android_l10n_import
         description: Import strings from android-l10n repo

taskcluster/kinds/android-startup-test/kind.yml

@@ -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/.
 ---
-loader: gecko_taskgraph.loader.transform:loader
+loader: taskgraph.loader.transform:loader
 
 transforms:
     - gecko_taskgraph.transforms.job:transforms
@@ -11,7 +11,7 @@ transforms:
 kind-dependencies:
     - signing-apk
 
-job-defaults:
+task-defaults:
     description: Runs UI tests for sanity checking startup on Nightly
     treeherder:
         kind: test
@@ -33,7 +33,7 @@ job-defaults:
         use-caches: false
     run-on-projects: []
 
-jobs:
+tasks:
     fenix-arm64-v8a-nightly-robo-opt:
         attributes:
             build-type: fenix-nightly

taskcluster/kinds/artifact-build/kind.yml

@@ -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/.
 ---
-loader: gecko_taskgraph.loader.transform:loader
+loader: taskgraph.loader.transform:loader
 
 kind-dependencies:
     - fetch
@@ -16,7 +16,7 @@ transforms:
     - gecko_taskgraph.transforms.artifact:transforms
     - gecko_taskgraph.transforms.task:transforms
 
-job-defaults:
+task-defaults:
     index:
         product: firefox
     treeherder:
@@ -42,7 +42,7 @@ job-defaults:
         keep-artifacts: false
     use-python: default
 
-jobs:
+tasks:
     linux64-artifact/opt:
         description: "Linux64 Opt Artifact Build"
         index:

taskcluster/kinds/attribution-l10n/kind.yml

@@ -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/.
 ---
-loader: gecko_taskgraph.loader.transform:loader
+loader: taskgraph.loader.transform:loader
 
 transforms:
     - gecko_taskgraph.transforms.attribution:resolve_keyed_by_transforms
@@ -19,7 +19,7 @@ kind-dependencies:
     # Mac
     - repackage-l10n
 
-job-defaults:
+task-defaults:
     description: Attribute release builds
     shipping-phase: promote
     # never run as part of CI
@@ -101,7 +101,7 @@ job-defaults:
                     - __MOZCUSTOM__dlsource%3D{attribution_code[json][dlsource]}
     use-python: default
 
-jobs:
+tasks:
     win32-devedition/opt:
         label: attribution-win32-{locale}-devedition/opt
         shipping-product: devedition

taskcluster/kinds/attribution/kind.yml

@@ -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/.
 ---
-loader: gecko_taskgraph.loader.transform:loader
+loader: taskgraph.loader.transform:loader
 
 transforms:
     - gecko_taskgraph.transforms.attribution:resolve_keyed_by_transforms
@@ -18,7 +18,7 @@ kind-dependencies:
     # Mac
     - repackage
 
-job-defaults:
+task-defaults:
     description: Attribute release builds
     shipping-phase: promote
     # never run as part of CI
@@ -86,7 +86,7 @@ job-defaults:
                     - __MOZCUSTOM__dlsource%3D{attribution_code[json][dlsource]}
     use-python: default
 
-jobs:
+tasks:
     win32-devedition/opt:
         label: attribution-win32-devedition/opt
         shipping-product: devedition

taskcluster/kinds/balrog/kind.yml

@@ -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/.
 ---
-loader: gecko_taskgraph.loader.transform:loader
+loader: taskgraph.loader.transform:loader
 
 transforms:
     - taskgraph.transforms.from_deps
@@ -26,7 +26,7 @@ not-for-build-platforms:
     - android-x86-shippable/opt
     - android-aarch64-shippable/opt
 
-jobs:
+tasks:
     balrog:
         from-deps:
             group-by: single-with-filters

taskcluster/kinds/beetmover-android-app/kind.yml

@@ -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/.
 ---
-loader: gecko_taskgraph.loader.transform:loader
+loader: taskgraph.loader.transform:loader
 
 transforms:
     - taskgraph.transforms.from_deps
@@ -15,7 +15,7 @@ kind-dependencies:
     - signing-apk
     - signing-bundle
 
-jobs:
+tasks:
     beetmover:
         from-deps:
             with-attributes:

taskcluster/kinds/beetmover-apt/kind.yml

@@ -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/.
 ---
-loader: gecko_taskgraph.loader.transform:loader
+loader: taskgraph.loader.transform:loader
 
 transforms:
     - taskgraph.transforms.from_deps
@@ -20,7 +20,7 @@ only-for-build-platforms:
     - linux-devedition/opt
     - linux64-devedition/opt
 
-jobs:
+tasks:
     beetmover-apt:
         from-deps:
             group-by: single-with-filters

taskcluster/kinds/beetmover-checksums/kind.yml

@@ -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/.
 ---
-loader: gecko_taskgraph.loader.transform:loader
+loader: taskgraph.loader.transform:loader
 
 transforms:
     - taskgraph.transforms.from_deps
@@ -17,7 +17,7 @@ only-for-attributes:
     - nightly
     - shippable
 
-jobs:
+tasks:
     beetmover-checksums:
         from-deps:
             group-by: single-with-filters

taskcluster/kinds/beetmover-components/kind.yml

@@ -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/.
 ---
-loader: gecko_taskgraph.loader.transform:loader
+loader: taskgraph.loader.transform:loader
 
 transforms:
     - taskgraph.transforms.from_deps
@@ -16,7 +16,7 @@ kind-dependencies:
     - build-components
     - post-signing-dummy
 
-jobs:
+tasks:
     push-to-maven:
         description: Publish component
         from-deps:

taskcluster/kinds/beetmover-geckoview/kind.yml

@@ -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/.
 ---
-loader: gecko_taskgraph.loader.transform:loader
+loader: taskgraph.loader.transform:loader
 
 transforms:
     - taskgraph.transforms.from_deps
@@ -37,7 +37,7 @@ not-for-build-platforms:
     - linux64-asan-reporter-shippable/opt
     - win64-asan-reporter-shippable/opt
 
-jobs:
+tasks:
     beetmover-geckoview:
         from-deps:
             group-by: single-with-filters

taskcluster/kinds/beetmover-repackage/kind.yml

@@ -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/.
 ---
-loader: gecko_taskgraph.loader.transform:loader
+loader: taskgraph.loader.transform:loader
 
 transforms:
     - taskgraph.transforms.from_deps
@@ -54,7 +54,7 @@ only-for-build-platforms:
     - linux64-asan-reporter-shippable/opt
     - win64-asan-reporter-shippable/opt
 
-jobs:
+tasks:
     beetmover-repackage:
         from-deps:
             group-by: single-locale

taskcluster/kinds/beetmover-source/kind.yml

@@ -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/.
 ---
-loader: gecko_taskgraph.loader.transform:loader
+loader: taskgraph.loader.transform:loader
 
 transforms:
     - taskgraph.transforms.from_deps
@@ -14,7 +14,7 @@ transforms:
 kind-dependencies:
     - release-source-signing
 
-jobs:
+tasks:
     beetmover-source:
         from-deps:
             group-by: single-with-filters

taskcluster/kinds/bootstrap/kind.yml

@@ -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/.
 ---
-loader: gecko_taskgraph.loader.transform:loader
+loader: taskgraph.loader.transform:loader
 
 kind-dependencies:
     - toolchain
@@ -11,7 +11,7 @@ transforms:
     - gecko_taskgraph.transforms.bootstrap:transforms
     - gecko_taskgraph.transforms.task:transforms
 
-jobs:
+tasks:
     debian11:
         image: debian:bullseye
         pre-commands:

taskcluster/kinds/bouncer-locations/kind.yml

@@ -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/.
 ---
-loader: gecko_taskgraph.loader.transform:loader
+loader: taskgraph.loader.transform:loader
 
 kind-dependencies:
     - post-beetmover-dummy
@@ -13,7 +13,7 @@ transforms:
     - gecko_taskgraph.transforms.release_deps:transforms
     - gecko_taskgraph.transforms.task:transforms
 
-job-defaults:
+task-defaults:
     description: nightly bouncer locations job
     attributes:
         shippable: true
@@ -34,7 +34,7 @@ job-defaults:
         kind: other
         tier: 1
 
-jobs:
+tasks:
     firefox:
         run-on-releases: ['nightly']
         run-on-projects: ['mozilla-central']

taskcluster/kinds/build-apk/kind.yml

@@ -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/.
 ---
-loader: gecko_taskgraph.loader.transform:loader
+loader: taskgraph.loader.transform:loader
 
 transforms:
     - android_taskgraph.transforms.build_android_app:transforms
@@ -14,7 +14,7 @@ kind-dependencies:
     - toolchain
     - build-fat-aar
 
-job-defaults:
+task-defaults:
     apk-artifact-template:
         type: file
         name: 'public/build/target.{abi}.apk'
@@ -23,7 +23,7 @@ job-defaults:
         build_platform: android
 
 
-jobs:
+tasks:
     focus-debug:
         attributes:
             shipping-product: focus

taskcluster/kinds/build-bundle/kind.yml

@@ -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/.
 ---
-loader: gecko_taskgraph.loader.transform:loader
+loader: taskgraph.loader.transform:loader
 
 transforms:
     - android_taskgraph.transforms.build_android_app:transforms
@@ -14,7 +14,7 @@ kind-dependencies:
     - toolchain
     - build-fat-aar
 
-job-defaults:
+task-defaults:
     aab-artifact-template:
         type: file
         name: 'public/build/target.aab'
@@ -27,7 +27,7 @@ job-defaults:
             - -Paab
 
 
-jobs:
+tasks:
     focus-debug:
         attributes:
             shipping-product: focus

taskcluster/kinds/build-components/kind.yml

@@ -17,7 +17,7 @@ kind-dependencies:
     - toolchain
     - build-fat-aar
 
-job-defaults:
+task-defaults:
     artifact-template:
         type: file
         name: public/build/{artifact_file_name}

taskcluster/kinds/build-fat-aar/kind.yml

@@ -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/.
 ---
-loader: gecko_taskgraph.loader.transform:loader
+loader: taskgraph.loader.transform:loader
 
 kind-dependencies:
     - build
@@ -18,7 +18,7 @@ transforms:
     - gecko_taskgraph.transforms.artifact:transforms
     - gecko_taskgraph.transforms.task:transforms
 
-job-defaults:
+task-defaults:
     attributes:
         artifact_map: taskcluster/gecko_taskgraph/manifests/fennec_geckoview.yml
     index:
@@ -100,7 +100,7 @@ job-defaults:
             - sysroot-x86_64-linux-gnu
             - sysroot-wasm32-wasi
 
-jobs:
+tasks:
     android-geckoview-fat-aar-shippable/opt:
         description: "Android GeckoView multi-architecture fat AAR Shippable"
         attributes:

taskcluster/kinds/build-mac-notarization/kind.yml

@@ -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/.
 ---
-loader: gecko_taskgraph.loader.transform:loader
+loader: taskgraph.loader.transform:loader
 
 transforms:
     - taskgraph.transforms.from_deps
@@ -17,7 +17,7 @@ kind-dependencies:
 only-for-attributes:
     - shippable
 
-jobs:
+tasks:
     build-mac-notarization:
         from-deps:
             group-by: single-with-filters

taskcluster/kinds/build-mac-signing/kind.yml

@@ -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/.
 ---
-loader: gecko_taskgraph.loader.transform:loader
+loader: taskgraph.loader.transform:loader
 
 transforms:
     - taskgraph.transforms.from_deps
@@ -25,7 +25,7 @@ only-for-build-platforms:
     - macosx64/debug
     - macosx64-aarch64/debug
 
-jobs:
+tasks:
     build-mac-signing:
         from-deps:
             group-by: single-with-filters

taskcluster/kinds/build-samples-browser/kind.yml

@@ -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/.
 ---
-loader: gecko_taskgraph.loader.transform:loader
+loader: taskgraph.loader.transform:loader
 
 transforms:
     - android_taskgraph.transforms.build_components:transforms
@@ -15,7 +15,7 @@ kind-dependencies:
     - build-fat-aar
 
 
-job-defaults:
+task-defaults:
     attributes:
         build_platform: android
         build-type: regular
@@ -49,7 +49,7 @@ job-defaults:
         env:
             ANDROID_SDK_ROOT: /builds/worker/fetches/android-sdk-linux
 
-jobs:
+tasks:
     gecko:
         run:
             gradlew:

taskcluster/kinds/build-signing/kind.yml

@@ -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/.
 ---
-loader: gecko_taskgraph.loader.transform:loader
+loader: taskgraph.loader.transform:loader
 
 transforms:
     - taskgraph.transforms.from_deps:transforms
@@ -28,7 +28,7 @@ not-for-build-platforms:
     - macosx64/debug
     - macosx64-aarch64/debug
 
-jobs:
+tasks:
     build-signing:
         from-deps:
             group-by: platform

taskcluster/kinds/build/android-asan.yml

@@ -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/.
 ---
-job-defaults:
+task-defaults:
     attributes:
         artifact_map: taskcluster/gecko_taskgraph/manifests/fennec_geckoview.yml
         maven_packages:

taskcluster/kinds/build/android-stuff.yml

@@ -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/.
 ---
-job-defaults:
+task-defaults:
     tags:
         android-stuff: "true"
     run:

taskcluster/kinds/build/android.yml

@@ -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/.
 ---
-job-defaults:
+task-defaults:
     attributes:
         artifact_map: taskcluster/gecko_taskgraph/manifests/fennec_geckoview.yml
         maven_packages:

taskcluster/kinds/build/ios.yml

@@ -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/.
 ---
-job-defaults:
+task-defaults:
     index:
         product: firefox
     treeherder:

taskcluster/kinds/build/kind.yml

@@ -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/.
 ---
-loader: gecko_taskgraph.loader.transform:loader
+loader: taskgraph.loader.transform:loader
 
 kind-dependencies:
     - toolchain
@@ -20,7 +20,7 @@ transforms:
     - gecko_taskgraph.transforms.artifact:transforms
     - gecko_taskgraph.transforms.task:transforms
 
-jobs-from:
+tasks-from:
     - android.yml
     - android-asan.yml
     - android-stuff.yml
@@ -32,7 +32,7 @@ jobs-from:
     - windows.yml
     - windows-mingw.yml
 
-job-defaults:
+task-defaults:
     worker:
         env:
             MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE: system

taskcluster/kinds/build/linux-base-toolchains.yml

@@ -4,9 +4,9 @@
 #
 # We have these build jobs in a separate file because their definitions are
 # different enough from the main Linux build jobs that their presence in
-# linux.yml would make using job-defaults there significantly less useful.
+# linux.yml would make using task-defaults there significantly less useful.
 ---
-job-defaults:
+task-defaults:
     worker-type: b-linux-gcp
     run:
         extra-config:

taskcluster/kinds/build/linux.yml

@@ -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/.
 ---
-job-defaults:
+task-defaults:
     worker-type: b-linux-gcp
 
 linux64/opt:

taskcluster/kinds/build/macosx-native.yml

@@ -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/.
 ---
-job-defaults:
+task-defaults:
     index:
         product: firefox
     worker-type: b-osx-1015

taskcluster/kinds/build/macosx.yml

@@ -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/.
 ---
-job-defaults:
+task-defaults:
     index:
         product: firefox
     worker-type: b-linux-gcp

taskcluster/kinds/build/windows-mingw.yml

@@ -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/.
 ---
-job-defaults:
+task-defaults:
     worker-type: b-linux-gcp
     worker:
         max-run-time: 7200

taskcluster/kinds/build/windows.yml

@@ -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/.
 ---
-job-defaults:
+task-defaults:
     run:
         using: mozharness
     fetches:

taskcluster/kinds/code-review/kind.yml

@@ -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/.
 ---
-loader: gecko_taskgraph.loader.transform:loader
+loader: taskgraph.loader.transform:loader
 
 transforms:
     - gecko_taskgraph.transforms.code_review:transforms
@@ -13,10 +13,10 @@ kind-dependencies:
     - source-test
     - toolchain
 
-job-defaults:
+task-defaults:
     use-python: default
 
-jobs:
+tasks:
     issues:
         label: code-review-issues
         description: List all issues found in static analysis and linting tasks

taskcluster/kinds/condprof/kind.yml

@@ -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/.
 ---
-loader: gecko_taskgraph.loader.transform:loader
+loader: taskgraph.loader.transform:loader
 
 kind-dependencies:
     - build
@@ -13,7 +13,7 @@ transforms:
     - gecko_taskgraph.transforms.job:transforms
     - gecko_taskgraph.transforms.task:transforms
 
-job-defaults:
+task-defaults:
     treeherder:
         kind: other
         tier: 2
@@ -30,7 +30,7 @@ job-defaults:
         taskcluster-proxy: true
         max-run-time: 10800
     use-python: default
-jobs:
+tasks:
     windows2012-64-firefox:
         worker-type: b-win2022
         description: Creates or updates conditioned profiles on Win64

taskcluster/kinds/cron-bouncer-check/kind.yml

@@ -2,14 +2,14 @@
 # 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: gecko_taskgraph.loader.transform:loader
+loader: taskgraph.loader.transform:loader
 
 transforms:
     - gecko_taskgraph.transforms.bouncer_check:transforms
     - gecko_taskgraph.transforms.job:transforms
     - gecko_taskgraph.transforms.task:transforms
 
-job-defaults:
+task-defaults:
     name: bouncer-check
     description: bouncer check
     worker-type: b-linux-gcp
@@ -29,7 +29,7 @@ job-defaults:
         kind: test
         tier: 1
 
-jobs:
+tasks:
     firefox:
         shipping-product: firefox
         index:

taskcluster/kinds/diffoscope/artifacts.yml

@@ -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/.
 ---
-job-defaults:
+task-defaults:
     # Artifact builds always build with nightly branding, so these checks don't
     # work on non-trunk branches.
     run-on-projects: ['trunk']

taskcluster/kinds/diffoscope/kind.yml

@@ -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/.
 ---
-loader: gecko_taskgraph.loader.transform:loader
+loader: taskgraph.loader.transform:loader
 
 kind-dependencies:
     - artifact-build
@@ -21,7 +21,7 @@ transforms:
 # Note: the .chk excludes are for files that are known to differ between
 # builds because they are signed with an ephemeral private key that is
 # generated for each build.
-job-defaults:
+task-defaults:
     tier: 2
     args: >-
         --output-empty
@@ -31,7 +31,7 @@ job-defaults:
         --exclude-directory-metadata=yes
         --exclude-command .--line-numbers
 
-jobs-from:
+tasks-from:
     - artifacts.yml
     - reproducible.yml
 
@@ -40,7 +40,7 @@ jobs-from:
 # from other sets through an index-search. Other kinds than `build` can be
 # compared (for example, static-analysis), provided you adjust the
 # kind-dependencies above.
-# jobs:
+# tasks:
 #     android-build-vs-previous-try:
 #         symbol: A
 #         new: build-android-arm/opt

taskcluster/kinds/diffoscope/reproducible.yml

@@ -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/.
 ---
-job-defaults:
+task-defaults:
     fail-on-diff: true
     run-on-projects: ['mozilla-central']
 

taskcluster/kinds/docker-image/kind.yml

@@ -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/.
 ---
-loader: gecko_taskgraph.loader.transform:loader
+loader: taskgraph.loader.transform:loader
 
 kind-dependencies:
     - packages
@@ -17,7 +17,7 @@ transforms:
 # (to use subdirectory clones of the proper directory), at which point we can
 # generate tasks for every docker image in the directory, secure in the
 # knowledge that unnecessary images will be omitted from the target task graph
-jobs:
+tasks:
     image_builder:
         symbol: I(ib)
     # Neither the ubuntu1804-*raw nor the ubuntu1804-*packages images can have

taskcluster/kinds/fetch/cft-chromedriver-fetch.yml

@@ -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/.
 ---
-job-defaults:
+task-defaults:
     fetch:
         type: cft-chromedriver-fetch
         script: /builds/worker/bin/fetch-cft-chromedriver.py

taskcluster/kinds/fetch/chromium-fetch.yml

@@ -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/.
 ---
-job-defaults:
+task-defaults:
     fetch:
         type: chromium-fetch
         script: /builds/worker/bin/fetch-chromium.py

taskcluster/kinds/fetch/kind.yml

@@ -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/.
 ---
-loader: gecko_taskgraph.loader.transform:loader
+loader: taskgraph.loader.transform:loader
 
 transforms:
     - gecko_taskgraph.transforms.fetch:transforms
@@ -10,7 +10,7 @@ transforms:
     - gecko_taskgraph.transforms.job:transforms
     - gecko_taskgraph.transforms.task:transforms
 
-jobs-from:
+tasks-from:
     - benchmarks.yml
     - browsertime.yml
     - chromium-fetch.yml

taskcluster/kinds/fuzzing/kind.yml

@@ -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/.
 ---
-loader: gecko_taskgraph.loader.transform:loader
+loader: taskgraph.loader.transform:loader
 
 transforms:
     - gecko_taskgraph.transforms.source_test:transforms
@@ -15,7 +15,7 @@ kind-dependencies:
     - toolchain
     - build
 
-job-defaults:
+task-defaults:
     worker-type: b-linux-gcp
     worker:
         max-run-time: 3600
@@ -29,7 +29,7 @@ job-defaults:
         substitution-fields: []
     if-dependencies: [build]
 
-jobs:
+tasks:
     simple:
         platform: linux64/opt
         require-build:

taskcluster/kinds/fxrecord/kind.yml

@@ -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/.
 ---
-loader: gecko_taskgraph.loader.transform:loader
+loader: taskgraph.loader.transform:loader
 
 kind-dependencies:
     - build
@@ -17,7 +17,7 @@ transforms:
     - gecko_taskgraph.transforms.release_notifications
     - gecko_taskgraph.transforms.task
 
-jobs:
+tasks:
     fxrecord:
         name: notify-fxrecord-failure
         description: "Desktop Startup Visual Metrics"

taskcluster/kinds/geckodriver-mac-notarization/kind.yml

@@ -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/.
 ---
-loader: gecko_taskgraph.loader.transform:loader
+loader: taskgraph.loader.transform:loader
 
 transforms:
     - taskgraph.transforms.from_deps
@@ -18,7 +18,7 @@ only-for-build-platforms:
     - macosx64-geckodriver/opt
     - macosx64-aarch64-geckodriver/opt
 
-jobs:
+tasks:
     geckodriver-mac-notarization:
         from-deps:
             group-by: single-with-filters

taskcluster/kinds/geckodriver-signing/kind.yml

@@ -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/.
 ---
-loader: gecko_taskgraph.loader.transform:loader
+loader: taskgraph.loader.transform:loader
 
 transforms:
     - taskgraph.transforms.from_deps
@@ -13,7 +13,7 @@ transforms:
 kind-dependencies:
     - toolchain
 
-jobs:
+tasks:
     geckodriver-signing:
         from-deps:
             with-attributes:

taskcluster/kinds/generate-profile/kind.yml

@@ -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/.
 ---
-loader: gecko_taskgraph.loader.transform:loader
+loader: taskgraph.loader.transform:loader
 
 kind-dependencies:
     - toolchain
@@ -17,14 +17,14 @@ transforms:
     - gecko_taskgraph.transforms.task:transforms
 
 
-job-defaults:
+task-defaults:
     treeherder:
         symbol: Bpgo(run)
         kind: build
         tier: 1
     use-python: default
 
-jobs:
+tasks:
     linux-shippable/opt:
         description: "Linux Profile Generation"
         shipping-phase: build

taskcluster/kinds/hazard/kind.yml

@@ -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/.
 ---
-loader: gecko_taskgraph.loader.transform:loader
+loader: taskgraph.loader.transform:loader
 
 kind-dependencies:
     - toolchain
@@ -14,7 +14,7 @@ transforms:
     - gecko_taskgraph.transforms.job:transforms
     - gecko_taskgraph.transforms.task:transforms
 
-job-defaults:
+task-defaults:
     attributes:
         retrigger: true
     treeherder:
@@ -26,7 +26,7 @@ job-defaults:
         docker-image: {in-tree: debian12-amd64-build}
     use-python: default
 
-jobs:
+tasks:
     linux64-shell-haz/debug:
         description: "JS Shell Hazard Analysis Linux"
         index:

taskcluster/kinds/instrumented-build/kind.yml

@@ -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/.
 ---
-loader: gecko_taskgraph.loader.transform:loader
+loader: taskgraph.loader.transform:loader
 
 kind-dependencies:
     - toolchain
@@ -17,7 +17,7 @@ transforms:
     - gecko_taskgraph.transforms.artifact:transforms
     - gecko_taskgraph.transforms.task:transforms
 
-job-defaults:
+task-defaults:
     shipping-phase: build
     treeherder:
         symbol: Bpgo(instr)
@@ -41,7 +41,7 @@ job-defaults:
         toolchain:
             - linux64-sccache
 
-jobs:
+tasks:
     linux-shippable/opt:
         description: "Linux Instrumented"
         index:

taskcluster/kinds/l10n-bump/kind.yml

@@ -2,13 +2,13 @@
 # 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: gecko_taskgraph.loader.transform:loader
+loader: taskgraph.loader.transform:loader
 
 transforms:
     - gecko_taskgraph.transforms.release_version_bump:transforms
     - gecko_taskgraph.transforms.task:transforms
 
-job-defaults:
+task-defaults:
     worker-type: tree
     worker:
         implementation: treescript
@@ -159,7 +159,7 @@ job-defaults:
                               },
                           ]
 
-jobs:
+tasks:
     l10n-bumper:
         name: l10n_bumper
         description: l10n changesets bumper

taskcluster/kinds/l10n-cross-channel/kind.yml

@@ -2,14 +2,14 @@
 # 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: gecko_taskgraph.loader.transform:loader
+loader: taskgraph.loader.transform:loader
 
 transforms:
     - gecko_taskgraph.transforms.cross_channel:transforms
     - gecko_taskgraph.transforms.job:transforms
     - gecko_taskgraph.transforms.task:transforms
 
-jobs:
+tasks:
     quarantine:
         description: Push strings from all shipping trains to the quarantine strings repo
         run-on-projects: []

taskcluster/kinds/l10n/kind.yml

@@ -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/.
 ---
-loader: gecko_taskgraph.loader.transform:loader
+loader: taskgraph.loader.transform:loader
 
 transforms:
     - taskgraph.transforms.from_deps
@@ -25,7 +25,7 @@ only-for-build-platforms:
     - win32-shippable/opt
     - win64-shippable/opt
 
-jobs:
+tasks:
     l10n:
         description: Localization
         from-deps:

taskcluster/kinds/mar-signing-autograph-stage/kind.yml

@@ -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/.
 ---
-loader: gecko_taskgraph.loader.transform:loader
+loader: taskgraph.loader.transform:loader
 
 transforms:
     - taskgraph.transforms.from_deps
@@ -16,7 +16,7 @@ kind-dependencies:
 only-for-build-platforms:
     - linux64-shippable/opt
 
-jobs:
+tasks:
     mar-signing-autograph-stage:
         from-deps:
             group-by: single-with-filters

taskcluster/kinds/mar-signing-l10n/kind.yml

@@ -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/.
 ---
-loader: gecko_taskgraph.loader.transform:loader
+loader: taskgraph.loader.transform:loader
 
 transforms:
     - taskgraph.transforms.from_deps
@@ -29,7 +29,7 @@ only-for-build-platforms:
     - win64-devedition/opt
     - win64-aarch64-devedition/opt
 
-jobs:
+tasks:
     mar-signing-l10n:
         from-deps:
             group-by: single-with-filters

taskcluster/kinds/mar-signing/kind.yml

@@ -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/.
 ---
-loader: gecko_taskgraph.loader.transform:loader
+loader: taskgraph.loader.transform:loader
 
 transforms:
     - taskgraph.transforms.from_deps
@@ -30,7 +30,7 @@ only-for-build-platforms:
     - linux64-asan-reporter-shippable/opt
     - win64-asan-reporter-shippable/opt
 
-jobs:
+tasks:
     mar-signing:
         from-deps:
             group-by: single-with-filters

taskcluster/kinds/maybe-release/kind.yml

@@ -2,13 +2,13 @@
 # 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: gecko_taskgraph.loader.transform:loader
+loader: taskgraph.loader.transform:loader
 
 transforms:
     - gecko_taskgraph.transforms.maybe_release:transforms
     - gecko_taskgraph.transforms.task:transforms
 
-job-defaults:
+task-defaults:
     description: Check recent releases and trigger a new ship-it phase if worthwhile.
     worker-type: shipit
     worker:
@@ -27,7 +27,7 @@ job-defaults:
         tier: 1
         kind: build
 
-jobs:
+tasks:
     firefox:
         name: maybe-release-firefox
         shipping-product: firefox