taskcluster-taskgraph 7.4.0__tar.gz → 8.0.1__tar.gz

{taskcluster-taskgraph-7.4.0/src/taskcluster_taskgraph.egg-info → taskcluster-taskgraph-8.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: taskcluster-taskgraph
-Version: 7.4.0
+Version: 8.0.1
 Summary: Build taskcluster taskgraphs
 Home-page: https://github.com/taskcluster/taskgraph
 Classifier: Development Status :: 5 - Production/Stable

{taskcluster-taskgraph-7.4.0 → taskcluster-taskgraph-8.0.1/src/taskcluster_taskgraph.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: taskcluster-taskgraph
-Version: 7.4.0
+Version: 8.0.1
 Summary: Build taskcluster taskgraphs
 Home-page: https://github.com/taskcluster/taskgraph
 Classifier: Development Status :: 5 - Production/Stable

{taskcluster-taskgraph-7.4.0 → taskcluster-taskgraph-8.0.1}/src/taskcluster_taskgraph.egg-info/SOURCES.txt

@@ -20,7 +20,6 @@ src/taskgraph/config.py
 src/taskgraph/create.py
 src/taskgraph/decision.py
 src/taskgraph/docker.py
-src/taskgraph/files_changed.py
 src/taskgraph/filter_tasks.py
 src/taskgraph/generator.py
 src/taskgraph/graph.py
@@ -78,6 +77,7 @@ src/taskgraph/util/path.py
 src/taskgraph/util/python_path.py
 src/taskgraph/util/readonlydict.py
 src/taskgraph/util/schema.py
+src/taskgraph/util/set_name.py
 src/taskgraph/util/shell.py
 src/taskgraph/util/taskcluster.py
 src/taskgraph/util/taskgraph.py
@@ -92,7 +92,7 @@ test/test_actions_rebuild_cached_tasks.py
 test/test_actions_registry.py
 test/test_create.py
 test/test_decision.py
-test/test_files_changed.py
+test/test_docker.py
 test/test_generator.py
 test/test_graph.py
 test/test_main.py
@@ -121,7 +121,6 @@ test/test_util_attributes.py
 test/test_util_cached_tasks.py
 test/test_util_dependencies.py
 test/test_util_docker.py
-test/test_util_memoize.py
 test/test_util_parameterization.py
 test/test_util_path.py
 test/test_util_python_path.py

{taskcluster-taskgraph-7.4.0 → taskcluster-taskgraph-8.0.1}/src/taskgraph/__init__.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/.
 
-__version__ = "7.4.0"
+__version__ = "8.0.1"
 
 # Maximum number of dependencies a single task can have
 # https://docs.taskcluster.net/reference/platform/taskcluster-queue/references/api#createTask

{taskcluster-taskgraph-7.4.0 → taskcluster-taskgraph-8.0.1}/src/taskgraph/decision.py

@@ -185,6 +185,9 @@ def get_decision_parameters(graph_config, options):
 
     # Define default filter list, as most configurations shouldn't need
     # custom filters.
+    parameters["files_changed"] = repo.get_changed_files(
+        rev=parameters["head_rev"], base_rev=parameters["base_rev"]
+    )
     parameters["filters"] = [
         "target_tasks_method",
     ]

{taskcluster-taskgraph-7.4.0 → taskcluster-taskgraph-8.0.1}/src/taskgraph/docker.py

@@ -18,6 +18,22 @@ except ImportError as e:
 from taskgraph.util import docker
 from taskgraph.util.taskcluster import get_artifact_url, get_session
 
+DEPLOY_WARNING = """
+*****************************************************************
+WARNING: Image is not suitable for deploying/pushing.
+
+To automatically tag the image the following files are required:
+- {image_dir}/REGISTRY
+- {image_dir}/VERSION
+
+The REGISTRY file contains the Docker registry hosting the image.
+A default REGISTRY file may also be defined in the parent docker
+directory.
+
+The VERSION file contains the version of the image.
+*****************************************************************
+"""
+
 
 def get_image_digest(image_name):
     from taskgraph.generator import load_tasks_for_kind
@@ -105,19 +121,18 @@ def build_image(name, tag, args=None):
 
     buf = BytesIO()
     docker.stream_context_tar(".", image_dir, buf, "", args)
-    subprocess.run(
-        ["docker", "image", "build", "--no-cache", "-t", tag, "-"], input=buf.getvalue()
-    )
+    cmdargs = ["docker", "image", "build", "--no-cache", "-"]
+    if tag:
+        cmdargs.insert(-1, f"-t={tag}")
+    subprocess.run(cmdargs, input=buf.getvalue())
 
-    print(f"Successfully built {name} and tagged with {tag}")
+    msg = f"Successfully built {name}"
+    if tag:
+        msg += f" and tagged with {tag}"
+    print(msg)
 
-    if tag.endswith(":latest"):
-        print("*" * 50)
-        print("WARNING: no VERSION file found in image directory.")
-        print("Image is not suitable for deploying/pushing.")
-        print("Create an image suitable for deploying/pushing by creating")
-        print("a VERSION file in the image directory.")
-        print("*" * 50)
+    if not tag or tag.endswith(":latest"):
+        print(DEPLOY_WARNING.format(image_dir=os.path.relpath(image_dir), image=name))
 
 
 def load_image(url, imageName=None, imageTag=None):

{taskcluster-taskgraph-7.4.0 → taskcluster-taskgraph-8.0.1}/src/taskgraph/main.py

@@ -96,7 +96,7 @@ def get_filtered_taskgraph(taskgraph, tasksregex, exclude_keys):
             for key in exclude_keys:
                 obj = task
                 attrs = key.split(".")
-                while attrs[0] in obj:
+                while obj and attrs[0] in obj:
                     if len(attrs) == 1:
                         del obj[attrs[0]]
                         break
@@ -121,7 +121,7 @@ def get_taskgraph_generator(root, parameters):
     return TaskGraphGenerator(root_dir=root, parameters=parameters)
 
 
-def format_taskgraph(options, parameters, logfile=None):
+def format_taskgraph(options, parameters, overrides, logfile=None):
     import taskgraph
     from taskgraph.parameters import parameters_loader
 
@@ -139,7 +139,7 @@ def format_taskgraph(options, parameters, logfile=None):
     if isinstance(parameters, str):
         parameters = parameters_loader(
             parameters,
-            overrides={"target-kinds": options.get("target_kinds")},
+            overrides=overrides,
             strict=False,
         )
 
@@ -173,7 +173,7 @@ def dump_output(out, path=None, params_spec=None):
     print(out + "\n", file=fh)
 
 
-def generate_taskgraph(options, parameters, logdir):
+def generate_taskgraph(options, parameters, overrides, logdir):
     from taskgraph.parameters import Parameters
 
     def logfile(spec):
@@ -189,14 +189,16 @@ def generate_taskgraph(options, parameters, logdir):
     # tracebacks a little more readable and avoids additional process overhead.
     if len(parameters) == 1:
         spec = parameters[0]
-        out = format_taskgraph(options, spec, logfile(spec))
+        out = format_taskgraph(options, spec, overrides, logfile(spec))
         dump_output(out, options["output_file"])
         return 0
 
     futures = {}
     with ProcessPoolExecutor(max_workers=options["max_workers"]) as executor:
         for spec in parameters:
-            f = executor.submit(format_taskgraph, options, spec, logfile(spec))
+            f = executor.submit(
+                format_taskgraph, options, spec, overrides, logfile(spec)
+            )
             futures[f] = spec
 
     returncode = 0
@@ -293,6 +295,15 @@ def generate_taskgraph(options, parameters, logdir):
     "generations will happen from the same invocation (one per parameters "
     "specified).",
 )
+@argument(
+    "--force-local-files-changed",
+    default=False,
+    action="store_true",
+    help="Compute the 'files-changed' parameter from local version control, "
+    "even when explicitly using a parameter set that already has it defined. "
+    "Note that this is already the default behaviour when no parameters are "
+    "specified.",
+)
 @argument(
     "--no-optimize",
     dest="optimize",
@@ -367,9 +378,11 @@ def show_taskgraph(options):
     diffdir = None
     output_file = options["output_file"]
 
-    if options["diff"]:
+    if options["diff"] or options["force_local_files_changed"]:
         repo = get_repository(os.getcwd())
 
+    if options["diff"]:
+        assert repo is not None
         if not repo.working_directory_clean():
             print(
                 "abort: can't diff taskgraph with dirty working directory",
@@ -393,15 +406,22 @@ def show_taskgraph(options):
         )
         print(f"Generating {options['graph_attr']} @ {cur_rev}", file=sys.stderr)
 
+    overrides = {
+        "target-kinds": options.get("target_kinds"),
+    }
     parameters: List[Any[str, Parameters]] = options.pop("parameters")
     if not parameters:
-        overrides = {
-            "target-kinds": options.get("target_kinds"),
-        }
         parameters = [
             parameters_loader(None, strict=False, overrides=overrides)
         ]  # will use default values
 
+        # This is the default behaviour anyway, so no need to re-compute.
+        options["force_local_files_changed"] = False
+
+    elif options["force_local_files_changed"]:
+        assert repo is not None
+        overrides["files-changed"] = sorted(repo.get_changed_files("AM"))
+
     for param in parameters[:]:
         if isinstance(param, str) and os.path.isdir(param):
             parameters.remove(param)
@@ -427,7 +447,7 @@ def show_taskgraph(options):
         # to setup its `mach` based logging.
         setup_logging()
 
-    ret = generate_taskgraph(options, parameters, logdir)
+    ret = generate_taskgraph(options, parameters, overrides, logdir)
 
     if options["diff"]:
         assert diffdir is not None
@@ -451,7 +471,7 @@ def show_taskgraph(options):
                 diffdir, f"{options['graph_attr']}_{base_rev_file}"
             )
             print(f"Generating {options['graph_attr']} @ {base_rev}", file=sys.stderr)
-            ret |= generate_taskgraph(options, parameters, logdir)
+            ret |= generate_taskgraph(options, parameters, overrides, logdir)
         finally:
             repo.update(cur_rev)
 

{taskcluster-taskgraph-7.4.0 → taskcluster-taskgraph-8.0.1}/src/taskgraph/optimize/strategies.py

@@ -1,8 +1,8 @@
 import logging
 from datetime import datetime
 
-from taskgraph import files_changed
 from taskgraph.optimize.base import OptimizationStrategy, register_strategy
+from taskgraph.util.path import match as match_path
 from taskgraph.util.taskcluster import find_task_id, status_task
 
 logger = logging.getLogger(__name__)
@@ -48,12 +48,20 @@ class IndexSearch(OptimizationStrategy):
 
 @register_strategy("skip-unless-changed")
 class SkipUnlessChanged(OptimizationStrategy):
+
+    def check(self, files_changed, patterns):
+        for pattern in patterns:
+            for path in files_changed:
+                if match_path(path, pattern):
+                    return True
+        return False
+
     def should_remove_task(self, task, params, file_patterns):
         # pushlog_id == -1 - this is the case when run from a cron.yml job or on a git repository
         if params.get("repository_type") == "hg" and params.get("pushlog_id") == -1:
             return False
 
-        changed = files_changed.check(params, file_patterns)
+        changed = self.check(params["files_changed"], file_patterns)
         if not changed:
             logger.debug(
                 f'no files found matching a pattern in `skip-unless-changed` for "{task.label}"'

{taskcluster-taskgraph-7.4.0 → taskcluster-taskgraph-8.0.1}/src/taskgraph/parameters.py

@@ -40,6 +40,7 @@ base_schema = Schema(
         Required("do_not_optimize"): [str],
         Required("enable_always_target"): Any(bool, [str]),
         Required("existing_tasks"): {str: str},
+        Required("files_changed"): [str],
         Required("filters"): [str],
         Required("head_ref"): str,
         Required("head_repository"): str,
@@ -86,6 +87,7 @@ def _get_defaults(repo_root=None):
         # Use fake values if no repo is detected.
         repo = Mock(branch="", head_rev="", tool="git")
         repo.get_url.return_value = ""
+        repo.get_changed_files.return_value = []
 
     try:
         repo_url = repo.get_url()
@@ -108,6 +110,7 @@ def _get_defaults(repo_root=None):
         "do_not_optimize": [],
         "enable_always_target": True,
         "existing_tasks": {},
+        "files_changed": repo.get_changed_files("AM"),
         "filters": ["target_tasks_method"],
         "head_ref": repo.branch or repo.head_rev,
         "head_repository": repo_url,

{taskcluster-taskgraph-7.4.0 → taskcluster-taskgraph-8.0.1}/src/taskgraph/transforms/from_deps.py

@@ -20,6 +20,7 @@ from taskgraph.transforms.run import fetches_schema
 from taskgraph.util.attributes import attrmatch
 from taskgraph.util.dependencies import GROUP_BY_MAP, get_dependencies
 from taskgraph.util.schema import Schema, validate_schema
+from taskgraph.util.set_name import SET_NAME_MAP
 
 FROM_DEPS_SCHEMA = Schema(
     {
@@ -41,12 +42,14 @@ FROM_DEPS_SCHEMA = Schema(
                 "set-name",
                 description=dedent(
                     """
-                When True, `from_deps` will derive a name for the generated
-                tasks from the name of the primary dependency. Defaults to
-                True.
+                UPDATE ME AND DOCS
                 """.lstrip()
                 ),
-            ): bool,
+            ): Any(
+                None,
+                *SET_NAME_MAP,
+                {Any(*SET_NAME_MAP): object},
+            ),
             Optional(
                 "with-attributes",
                 description=dedent(
@@ -170,7 +173,7 @@ def from_deps(config, tasks):
             groups = func(config, deps)
 
         # Split the task, one per group.
-        set_name = from_deps.get("set-name", True)
+        set_name = from_deps.get("set-name", "strip-kind")
         copy_attributes = from_deps.get("copy-attributes", False)
         unique_kinds = from_deps.get("unique-kinds", True)
         fetches = from_deps.get("fetches", [])
@@ -203,10 +206,8 @@ def from_deps(config, tasks):
             primary_dep = [dep for dep in group if dep.kind == primary_kind][0]
 
             if set_name:
-                if primary_dep.label.startswith(primary_kind):
-                    new_task["name"] = primary_dep.label[len(primary_kind) + 1 :]
-                else:
-                    new_task["name"] = primary_dep.label
+                func = SET_NAME_MAP[set_name]
+                new_task["name"] = func(config, deps, primary_dep, primary_kind)
 
             if copy_attributes:
                 attrs = new_task.setdefault("attributes", {})

{taskcluster-taskgraph-7.4.0 → taskcluster-taskgraph-8.0.1}/src/taskgraph/transforms/run/__init__.py

@@ -167,7 +167,8 @@ def add_resource_monitor(config, tasks):
                 config.graph_config, task["worker-type"]
             )
             # Normalise worker os so that linux-bitbar and similar use linux tools.
-            worker_os = worker_os.split("-")[0]
+            if worker_os:
+                worker_os = worker_os.split("-")[0]
             if "win7" in task["worker-type"]:
                 arch = "32"
             else:

{taskcluster-taskgraph-7.4.0 → taskcluster-taskgraph-8.0.1}/src/taskgraph/util/cached_tasks.py

@@ -7,9 +7,7 @@ import hashlib
 import time
 
 TARGET_CACHE_INDEX = "{cache_prefix}.cache.level-{level}.{type}.{name}.hash.{digest}"
-TARGET_PR_CACHE_INDEX = (
-    "{cache_prefix}.cache.head.{head_ref}.{type}.{name}.hash.{digest}"
-)
+TARGET_PR_CACHE_INDEX = "{cache_prefix}.cache.pr.{type}.{name}.hash.{digest}"
 EXTRA_CACHE_INDEXES = [
     "{cache_prefix}.cache.level-{level}.{type}.{name}.latest",
     "{cache_prefix}.cache.level-{level}.{type}.{name}.pushdate.{build_date_long}",

{taskcluster-taskgraph-7.4.0 → taskcluster-taskgraph-8.0.1}/src/taskgraph/util/docker.py

@@ -7,6 +7,7 @@ import hashlib
 import io
 import os
 import re
+from typing import Optional
 
 from taskgraph.util.archive import create_tar_gz_from_files
 from taskgraph.util.memoize import memoize
@@ -16,17 +17,27 @@ IMAGE_DIR = os.path.join(".", "taskcluster", "docker")
 from .yaml import load_yaml
 
 
-def docker_image(name, by_tag=False):
+def docker_image(name: str, by_tag: bool = False) -> Optional[str]:
     """
     Resolve in-tree prebuilt docker image to ``<registry>/<repository>@sha256:<digest>``,
     or ``<registry>/<repository>:<tag>`` if `by_tag` is `True`.
+
+    Args:
+        name (str): The image to build.
+        by_tag (bool): If True, will apply a tag based on VERSION file.
+            Otherwise will apply a hash based on HASH file.
+    Returns:
+        Optional[str]: Image if it can be resolved, otherwise None.
     """
     try:
         with open(os.path.join(IMAGE_DIR, name, "REGISTRY")) as f:
             registry = f.read().strip()
     except OSError:
-        with open(os.path.join(IMAGE_DIR, "REGISTRY")) as f:
-            registry = f.read().strip()
+        try:
+            with open(os.path.join(IMAGE_DIR, "REGISTRY")) as f:
+                registry = f.read().strip()
+        except OSError:
+            return None
 
     if not by_tag:
         hashfile = os.path.join(IMAGE_DIR, name, "HASH")
@@ -34,7 +45,7 @@ def docker_image(name, by_tag=False):
             with open(hashfile) as f:
                 return f"{registry}/{name}@{f.read().strip()}"
         except OSError:
-            raise Exception(f"Failed to read HASH file {hashfile}")
+            return None
 
     try:
         with open(os.path.join(IMAGE_DIR, name, "VERSION")) as f:

taskcluster-taskgraph-8.0.1/src/taskgraph/util/memoize.py

@@ -0,0 +1,7 @@
+# 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 functools
+
+memoize = functools.lru_cache(maxsize=None)  # backwards compatibility shim

{taskcluster-taskgraph-7.4.0 → taskcluster-taskgraph-8.0.1}/src/taskgraph/util/parameterization.py

@@ -83,10 +83,11 @@ def resolve_task_references(label, task_def, task_id, decision_task_id, dependen
                         f"task '{label}' has no dependency named '{dependency}'"
                     )
 
-            assert artifact_name.startswith(
-                "public/"
-            ), f"artifact-reference only supports public artifacts, not `{artifact_name}`"
-            return get_artifact_url(task_id, artifact_name)
+            use_proxy = False
+            if not artifact_name.startswith("public/"):
+                use_proxy = True
+
+            return get_artifact_url(task_id, artifact_name, use_proxy=use_proxy)
 
         return ARTIFACT_REFERENCE_PATTERN.sub(repl, val)
 

taskcluster-taskgraph-8.0.1/src/taskgraph/util/set_name.py

@@ -0,0 +1,34 @@
+# 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/.
+
+# Define a collection of set_name functions
+# Note: this is stored here instead of where it is used in the `from_deps`
+# transform to give consumers a chance to register their own `set_name`
+# handlers before the `from_deps` schema is created.
+SET_NAME_MAP = {}
+
+
+def set_name(name, schema=None):
+    def wrapper(func):
+        assert (
+            name not in SET_NAME_MAP
+        ), f"duplicate set_name function name {name} ({func} and {SET_NAME_MAP[name]})"
+        SET_NAME_MAP[name] = func
+        func.schema = schema
+        return func
+
+    return wrapper
+
+
+@set_name("strip-kind")
+def set_name_strip_kind(config, tasks, primary_dep, primary_kind):
+    if primary_dep.label.startswith(primary_kind):
+        return primary_dep.label[len(primary_kind) + 1 :]
+    else:
+        return primary_dep.label
+
+
+@set_name("retain-kind")
+def set_name_retain_kind(config, tasks, primary_dep, primary_kind):
+    return primary_dep.label

{taskcluster-taskgraph-7.4.0 → taskcluster-taskgraph-8.0.1}/src/taskgraph/util/taskcluster.py

@@ -140,22 +140,9 @@ def _handle_artifact(path, response):
 
 def get_artifact_url(task_id, path, use_proxy=False):
     artifact_tmpl = liburls.api(
-        get_root_url(False), "queue", "v1", "task/{}/artifacts/{}"
+        get_root_url(use_proxy), "queue", "v1", "task/{}/artifacts/{}"
     )
-    data = artifact_tmpl.format(task_id, path)
-    if use_proxy:
-        # Until Bug 1405889 is deployed, we can't download directly
-        # from the taskcluster-proxy.  Work around by using the /bewit
-        # endpoint instead.
-        # The bewit URL is the body of a 303 redirect, which we don't
-        # want to follow (which fetches a potentially large resource).
-        response = _do_request(
-            os.environ["TASKCLUSTER_PROXY_URL"] + "/bewit",
-            data=data,
-            allow_redirects=False,
-        )
-        return response.text
-    return data
+    return artifact_tmpl.format(task_id, path)
 
 
 def get_artifact(task_id, path, use_proxy=False):

{taskcluster-taskgraph-7.4.0 → taskcluster-taskgraph-8.0.1}/test/test_decision.py

@@ -46,12 +46,16 @@ class TestDecision(unittest.TestCase):
             decision.ARTIFACTS_DIR = Path("artifacts")
 
 
+@unittest.mock.patch.object(
+    GitRepository,
+    "get_changed_files",
+)
 class TestGetDecisionParameters(unittest.TestCase):
     def setUp(self):
         self.options = {
             "base_repository": "https://hg.mozilla.org/mozilla-unified",
             "head_repository": "https://hg.mozilla.org/mozilla-central",
-            "head_rev": "abcd",
+            "head_rev": "bbbb",
             "head_ref": "default",
             "head_tag": "v0.0.1",
             "project": "mozilla-central",
@@ -66,11 +70,11 @@ class TestGetDecisionParameters(unittest.TestCase):
         self.old_determine_more_accurate_base_rev = (
             decision._determine_more_accurate_base_rev
         )
-        decision._determine_more_accurate_base_rev = lambda *_, **__: "abcd"
+        decision._determine_more_accurate_base_rev = lambda *_, **__: "aaaa"
         self.old_determine_more_accurate_base_ref = (
             decision._determine_more_accurate_base_ref
         )
-        decision._determine_more_accurate_base_ref = lambda *_, **__: "abcd"
+        decision._determine_more_accurate_base_ref = lambda *_, **__: "aaaa"
 
     def tearDown(self):
         decision._determine_more_accurate_base_rev = (
@@ -80,14 +84,18 @@ class TestGetDecisionParameters(unittest.TestCase):
             self.old_determine_more_accurate_base_ref
         )
 
-    def test_simple_options(self):
+    def test_simple_options(self, mock_files_changed):
+        mock_files_changed.return_value = ["foo.txt"]
         params = decision.get_decision_parameters(FAKE_GRAPH_CONFIG, self.options)
+        mock_files_changed.assert_called_once_with(rev="bbbb", base_rev="aaaa")
         self.assertEqual(params["build_date"], 1503691511)
         self.assertEqual(params["head_tag"], "v0.0.1")
         self.assertEqual(params["pushlog_id"], "143")
         self.assertEqual(params["moz_build_date"], "20170825200511")
+        self.assertEqual(params["files_changed"], ["foo.txt"])
 
-    def test_no_email_owner(self):
+    def test_no_email_owner(self, mock_files_changed):
+        mock_files_changed.return_value = ["foo.txt"]
         self.options["owner"] = "ffxbld"
         params = decision.get_decision_parameters(FAKE_GRAPH_CONFIG, self.options)
         self.assertEqual(params["owner"], "ffxbld@noreply.mozilla.org")
@@ -102,11 +110,14 @@ class TestGetDecisionParameters(unittest.TestCase):
         "get_commit_message",
         unittest.mock.MagicMock(return_value="Add Foo"),
     )
-    def test_regular_commit_message_yields_default_target_tasks_method(self):
+    def test_regular_commit_message_yields_default_target_tasks_method(
+        self, mock_files_changed
+    ):
         """
         Ensures `target_tasks_method` is `default` when the commit message does not contain
         `DONTBUILD`.
         """
+        mock_files_changed.return_value = ["foo.txt"]
         self.options["tasks_for"] = "github-push"
         params = decision.get_decision_parameters(FAKE_GRAPH_CONFIG, self.options)
         self.assertEqual(params["target_tasks_method"], "default")
@@ -125,10 +136,13 @@ class TestGetDecisionParameters(unittest.TestCase):
         "get_commit_message",
         unittest.mock.MagicMock(return_value="DONTBUILD"),
     )
-    def test_dontbuild_commit_message_yields_default_target_tasks_method(self):
+    def test_dontbuild_commit_message_yields_default_target_tasks_method(
+        self, mock_files_changed
+    ):
         """
         Ensures `target_tasks_method` is `nothing` when the commit message contains `DONTBUILD`.
         """
+        mock_files_changed.return_value = ["foo.txt"]
         self.options["tasks_for"] = "github-release"
         params = decision.get_decision_parameters(FAKE_GRAPH_CONFIG, self.options)
         self.assertNotEqual(params["target_tasks_method"], "nothing")

taskcluster-taskgraph-8.0.1/test/test_docker.py

@@ -0,0 +1,55 @@
+import pytest
+
+from taskgraph import docker
+
+
+@pytest.fixture(autouse=True, scope="module")
+def mock_docker_path(module_mocker, datadir):
+    module_mocker.patch(
+        "taskgraph.util.docker.IMAGE_DIR", str(datadir / "taskcluster" / "docker")
+    )
+
+
+@pytest.fixture
+def mock_docker_build(mocker):
+    def side_effect(topsrcdir, context_dir, out_file, image_name=None, args=None):
+        out_file.write(b"xyz")
+
+    m_stream = mocker.patch.object(docker.docker, "stream_context_tar")
+    m_stream.side_effect = side_effect
+
+    m_run = mocker.patch.object(docker.subprocess, "run")
+    return (m_stream, m_run)
+
+
+def test_build_image(capsys, mock_docker_build):
+    m_stream, m_run = mock_docker_build
+    image = "hello-world-tag"
+    tag = f"test/{image}:1.0"
+
+    assert docker.build_image(image, None) is None
+    m_stream.assert_called_once()
+    m_run.assert_called_once_with(
+        ["docker", "image", "build", "--no-cache", f"-t={tag}", "-"],
+        input=b"xyz",
+    )
+
+    out, _ = capsys.readouterr()
+    assert f"Successfully built {image} and tagged with {tag}" in out
+    assert "Image is not suitable for deploying/pushing" not in out
+
+
+def test_build_image_no_tag(capsys, mock_docker_build):
+    m_stream, m_run = mock_docker_build
+    image = "hello-world"
+
+    assert docker.build_image(image, None) is None
+    m_stream.assert_called_once()
+    m_run.assert_called_once_with(
+        ["docker", "image", "build", "--no-cache", "-"],
+        input=b"xyz",
+    )
+
+    out, _ = capsys.readouterr()
+    assert f"Successfully built {image}" in out
+    assert "Image is not suitable for deploying/pushing" in out