Bug 1776431 - Port 1766316 to Thunderbird - Merge 'transforms/base.py' between upstream and gecko taskgraphs. r=aleca
authorNicolai Kasper <nicolai@thunderbird.net>
Fri, 24 Jun 2022 15:59:13 +0000
changeset 36124 fa52f2ff45286a477b4fc2af0a73fbbfed4bbad9
parent 36123 d88eeef32235dd7a5f107cb954d6b7d4db1b8500
child 36125 4f78bd01de3ed1f77efe6b1509a0c4b4bac4a838
push id20045
push useralessandro@thunderbird.net
push dateFri, 24 Jun 2022 16:01:17 +0000
treeherdercomm-central@fa52f2ff4528 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaleca
bugs1776431, 1766316
Bug 1776431 - Port 1766316 to Thunderbird - Merge 'transforms/base.py' between upstream and gecko taskgraphs. r=aleca Differential Revision: https://phabricator.services.mozilla.com/D150251
taskcluster/comm_taskgraph/loader/reference.py
taskcluster/comm_taskgraph/transforms/job/toolchain.py
--- a/taskcluster/comm_taskgraph/loader/reference.py
+++ b/taskcluster/comm_taskgraph/loader/reference.py
@@ -3,17 +3,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from __future__ import absolute_import, print_function, unicode_literals
 
 import os
 import logging
 
 from taskgraph.util.yaml import load_yaml
-from gecko_taskgraph.util.python_path import find_object
+from taskgraph.util.python_path import find_object
 
 logger = logging.getLogger(__name__)
 
 
 def _get_aliases(kind, job):
     aliases = {job["name"]}
 
     if kind == "toolchain":
--- a/taskcluster/comm_taskgraph/transforms/job/toolchain.py
+++ b/taskcluster/comm_taskgraph/transforms/job/toolchain.py
@@ -25,17 +25,17 @@ from gecko_taskgraph.transforms.job.tool
 )
 from gecko_taskgraph.transforms.job.common import (
     docker_worker_add_artifacts,
 )
 
 from comm_taskgraph.util.hash import hash_paths_extended
 from gecko_taskgraph.util.hash import hash_paths as hash_paths_gecko_root
 from gecko_taskgraph import GECKO
-import gecko_taskgraph
+import taskgraph
 
 CACHE_TYPE = "toolchains.v3"
 
 TOOLCHAIN_SCRIPT_PATH = "comm/taskcluster/scripts"
 
 
 comm_toolchain_run_schema = toolchain_run_schema.extend(
     {
@@ -133,17 +133,17 @@ def docker_worker_toolchain(config, job,
         }
     )
 
     attributes = taskdesc.setdefault("attributes", {})
     attributes["toolchain-artifact"] = run.pop("toolchain-artifact")
     if "toolchain-alias" in run:
         attributes["toolchain-alias"] = run.pop("toolchain-alias")
 
-    if not gecko_taskgraph.fast:
+    if not taskgraph.fast:
         name = taskdesc["label"].replace("{}-".format(config.kind), "", 1)
         taskdesc["cache"] = {
             "type": CACHE_TYPE,
             "name": name,
             "digest-data": get_digest_data(config, run, taskdesc),
         }
 
     run["using"] = "run-task"
@@ -232,17 +232,17 @@ def docker_macos_sdk_fetch(config, job, 
             "MOZ_FETCHES_DIR": upload_dir,
         }
     )
 
     attributes["toolchain-artifact"] = run.pop("toolchain-artifact")
     if "toolchain-alias" in run:
         attributes["toolchain-alias"] = run.pop("toolchain-alias")
 
-    if not gecko_taskgraph.fast:
+    if not taskgraph.fast:
         name = taskdesc["label"].replace("{}-".format(config.kind), "", 1)
         taskdesc["cache"] = {
             "type": CACHE_TYPE,
             "name": name,
             "digest-data": get_digest_data(config, run, taskdesc),
         }
 
     run["using"] = "run-task"