tor-browser

commit 2333729a4bb82ba2b20251102283820bc23bd8d8
parent a4078f8799a95c354a0a50ee4d67900bc0c8c141
Author: Atila Butkovits <abutkovits@mozilla.com>
Date:   Fri, 28 Nov 2025 23:14:57 +0200

Revert "Bug 2002591 - Restore appropriate dynamic chunking behavior for gecko_taskgraph.util.chunking.chunk_manifests r=taskgraph-reviewers,ahal" for causing Gecko Decision task failures.

This reverts commit a4078f8799a95c354a0a50ee4d67900bc0c8c141.

Diffstat:
M
taskcluster/gecko_taskgraph/util/chunking.py
 | 
19
++++++++++++-------

1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/taskcluster/gecko_taskgraph/util/chunking.py b/taskcluster/gecko_taskgraph/util/chunking.py
@@ -175,17 +175,22 @@ def chunk_manifests(suite, platform, chunks, manifests):
         A list of length `chunks` where each item contains a list of manifests
         that run in that chunk.
     """
-    if "web-platform-tests" not in suite:
-        ini_manifests = {x.replace(".toml", ".ini"): x for x in manifests}
+    ini_manifests = set([x.replace(".toml", ".ini") for x in manifests])
+
+    if "web-platform-tests" not in suite and "marionette" not in suite:
         runtimes = {
             k: v for k, v in get_runtimes(platform, suite).items() if k in ini_manifests
         }
+        retVal = []
+        for c in chunk_by_runtime(None, chunks, runtimes).get_chunked_manifests(
+            ini_manifests
+        ):
+            retVal.append(
+                [m if m in manifests else m.replace(".ini", ".toml") for m in c[1]]
+            )
 
-        cbr = chunk_by_runtime(None, chunks, runtimes)
-        return [
-            [ini_manifests.get(m, m) for m in c]
-            for _, c in cbr.get_chunked_manifests(manifests)
-        ]
+    # Keep track of test paths for each chunk, and the runtime information.
+    chunked_manifests = [[] for _ in range(chunks)]
 
     # Spread out the test manifests evenly across all chunks.
     for index, key in enumerate(sorted(manifests)):