taskcluster-taskgraph 8.1.0__tar.gz → 8.2.0__tar.gz

{taskcluster-taskgraph-8.1.0/src/taskcluster_taskgraph.egg-info → taskcluster-taskgraph-8.2.0}/PKG-INFO

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

{taskcluster-taskgraph-8.1.0 → taskcluster-taskgraph-8.2.0/src/taskcluster_taskgraph.egg-info}/PKG-INFO

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

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

{taskcluster-taskgraph-8.1.0 → taskcluster-taskgraph-8.2.0}/src/taskgraph/docker.py

@@ -16,7 +16,10 @@ except ImportError as e:
     zstd = e
 
 from taskgraph.util import docker
-from taskgraph.util.taskcluster import get_artifact_url, get_session
+from taskgraph.util.taskcluster import (
+    get_artifact_url,
+    get_session,
+)
 
 DEPLOY_WARNING = """
 *****************************************************************
@@ -59,10 +62,9 @@ def load_image_by_name(image_name, tag=None):
     )
     tasks = load_tasks_for_kind(params, "docker-image")
     task = tasks[f"build-docker-image-{image_name}"]
-    deadline = None
-    task_id = IndexSearch().should_replace_task(
-        task, {}, deadline, task.optimization.get("index-search", [])
-    )
+
+    indexes = task.optimization.get("index-search", [])
+    task_id = IndexSearch().should_replace_task(task, {}, None, indexes)
 
     if task_id in (True, False):
         print(

{taskcluster-taskgraph-8.1.0 → taskcluster-taskgraph-8.2.0}/src/taskgraph/optimize/strategies.py

@@ -3,6 +3,7 @@ from datetime import datetime
 
 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__)
 
@@ -23,12 +24,28 @@ class IndexSearch(OptimizationStrategy):
 
     def should_replace_task(self, task, params, deadline, arg):
         "Look for a task with one of the given index paths"
-        index_paths, label_to_taskid, taskid_to_status = arg
+        batched = False
+        # Appease static checker that doesn't understand that this is not needed
+        label_to_taskid = {}
+        taskid_to_status = {}
+
+        if isinstance(arg, tuple) and len(arg) == 3:
+            # allow for a batched call optimization instead of two queries
+            # per index path
+            index_paths, label_to_taskid, taskid_to_status = arg
+            batched = True
+        else:
+            index_paths = arg
 
         for index_path in index_paths:
             try:
-                task_id = label_to_taskid[index_path]
-                status = taskid_to_status[task_id]
+                if batched:
+                    task_id = label_to_taskid[index_path]
+                    status = taskid_to_status[task_id]
+                else:
+                    # 404 is raised as `KeyError` also end up here
+                    task_id = find_task_id(index_path)
+                    status = status_task(task_id)
                 # status can be `None` if we're in `testing` mode
                 # (e.g. test-action-callback)
                 if not status or status.get("state") in ("exception", "failed"):

{taskcluster-taskgraph-8.1.0 → taskcluster-taskgraph-8.2.0}/test/test_optimize_strategies.py

@@ -1,6 +1,7 @@
 # Any copyright is dedicated to the public domain.
 # http://creativecommons.org/publicdomain/zero/1.0/
 
+import os
 from datetime import datetime
 from test.fixtures.gen import make_task
 from time import mktime
@@ -43,9 +44,29 @@ def params():
         ),
     ),
 )
-def test_index_search(state, expires, expected):
+def test_index_search(responses, params, state, expires, expected):
     taskid = "abc"
     index_path = "foo.bar.latest"
+
+    responses.add(
+        responses.GET,
+        f"{os.environ['TASKCLUSTER_ROOT_URL']}/api/index/v1/task/{index_path}",
+        json={"taskId": taskid},
+        status=200,
+    )
+
+    responses.add(
+        responses.GET,
+        f"{os.environ['TASKCLUSTER_ROOT_URL']}/api/queue/v1/task/{taskid}/status",
+        json={
+            "status": {
+                "state": state,
+                "expires": expires,
+            }
+        },
+        status=200,
+    )
+
     label_to_taskid = {index_path: taskid}
     taskid_to_status = {
         taskid: {
@@ -58,10 +79,12 @@ def test_index_search(state, expires, expected):
     deadline = "2021-06-07T19:03:20.482Z"
     assert (
         opt.should_replace_task(
-            {}, params, deadline, ((index_path,), label_to_taskid, taskid_to_status)
+            {}, params, deadline, ([index_path], label_to_taskid, taskid_to_status)
         )
         == expected
     )
+    # test the non-batched variant as well
+    assert opt.should_replace_task({}, params, deadline, [index_path]) == expected
 
 
 @pytest.mark.parametrize(