fix: updated docker tests

Author: abhishekmadan30

src/taskgraph/docker.py

@@ -97,7 +97,7 @@ def load_image_by_task_id(task_id, tag=None):
     return tag
 
 
-def build_context(name, outputFile, args=None, graph_config=None):
+def build_context(name, outputFile, graph_config, args=None):
     """Build a context.tar for image with specified name."""
     if not name:
         raise ValueError("must provide a Docker image name")
@@ -111,7 +111,7 @@ def build_context(name, outputFile, args=None, graph_config=None):
     docker.create_context_tar(".", image_dir, outputFile, args)
 
 
-def build_image(name, tag, args=None, graph_config=None):
+def build_image(name, tag, graph_config, args=None):
     """Build a Docker image of specified name.
 
     Output from image building process will be printed to stdout.

test/data/taskcluster/kinds/docker-image/kind.yml

@@ -0,0 +1,38 @@
+# 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/.
+---
+meta:
+    - &uv_version 0.6.1
+
+loader: taskgraph.loader.transform:loader
+
+transforms:
+    - taskgraph.transforms.docker_image:transforms
+    - taskgraph.transforms.cached_tasks:transforms
+    - taskgraph.transforms.task:transforms
+
+# make a task for each docker-image we might want.  For the moment, since we
+# write artifacts for each, these are whitelisted, but ideally that will change
+# (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
+tasks:
+    decision:
+        symbol: I(d)
+        parent: run-task
+    fetch:
+        symbol: I(fetch)
+    index-task:
+        symbol: I(idx)
+    python:
+        symbol: I(py)
+        args:
+            PYTHON_VERSIONS: "3.13 3.12 3.11 3.10 3.9 3.8"
+            UV_VERSION: *uv_version
+    run-task:
+        symbol: I(rt)
+        args:
+            UV_VERSION: *uv_version
+    skopeo:
+        symbol: I(skopeo)

test/test_docker.py

@@ -4,6 +4,7 @@
 import pytest
 
 from taskgraph import docker
+from taskgraph.config import GraphConfig
 
 
 @pytest.fixture(autouse=True, scope="module")
@@ -30,7 +31,15 @@ def test_build_image(capsys, mock_docker_build):
     image = "hello-world-tag"
     tag = f"test/{image}:1.0"
 
-    assert docker.build_image(image, None) is None
+    graph_config = GraphConfig(
+        {
+            "trust-domain": "test-domain",
+            "docker-image-kind": "docker-image",
+        },
+        "test/data/taskcluster",
+    )
+
+    assert docker.build_image(image, None, graph_config=graph_config) is None
     m_stream.assert_called_once()
     m_run.assert_called_once_with(
         ["docker", "image", "build", "--no-cache", f"-t={tag}", "-"],
@@ -47,7 +56,15 @@ 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
+    graph_config = GraphConfig(
+        {
+            "trust-domain": "test-domain",
+            "docker-image-kind": "docker-image",
+        },
+        "test/data/taskcluster",
+    )
+
+    assert docker.build_image(image, None, graph_config=graph_config) is None
     m_stream.assert_called_once()
     m_run.assert_called_once_with(
         ["docker", "image", "build", "--no-cache", "-"],
@@ -71,8 +88,16 @@ def mock_run(*popenargs, check=False, **kwargs):
     m_run.side_effect = mock_run
     image = "hello-world"
 
+    graph_config = GraphConfig(
+        {
+            "trust-domain": "test-domain",
+            "docker-image-kind": "docker-image",
+        },
+        "test/data/taskcluster",
+    )
+
     with pytest.raises(Exception):
-        docker.build_image(image, None)
+        docker.build_image(image, None, graph_config=graph_config)
     m_stream.assert_called_once()
     m_run.assert_called_once_with(
         ["docker", "image", "build", "--no-cache", "-"],