From ec142ffacbd796604e375f521dd296a9b52a9588 Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Thu, 15 Oct 2026 01:03:25 +0200
Subject: [PATCH] Run shared-resource integration scopes in name order, longest
 scope first

Tests in the host-services scope leave state behind for each other:
test_containerized_jobs builds a mulled image under quay.io/local that
test_container_resolvers expects to be absent from the Docker image
cache. Ordering groups by recorded duration ran the image build first.
Order each scope's groups by name, as the serial run does, and order
the scopes themselves by their total recorded duration so the large
host-services scope starts first.
---
 test/integration/conftest.py | 47 ++++++++++++++++++++++++++++++------
 1 file changed, 39 insertions(+), 8 deletions(-)

diff --git a/test/integration/conftest.py b/test/integration/conftest.py
index a91402f834a..1d9de8bd426 100644
--- a/test/integration/conftest.py
+++ b/test/integration/conftest.py
@@ -4,6 +4,7 @@ import os
 import sys
 import tempfile
 import threading
+from collections import defaultdict
 
 import pytest
 from beaker.cache import CacheManager
@@ -21,10 +22,7 @@ from galaxy_test.conftest import pytest_plugins  # noqa: F401
 from galaxy_test.conftest import (
     pytest_configure as _base_pytest_configure,
 )
-from galaxy_test.shard import (  # noqa: F401
-    pytest_collection_modifyitems,
-    pytest_report_collectionfinish,
-)
+from galaxy_test.shard import pytest_report_collectionfinish  # noqa: F401
 
 # Tests that share something outside their Galaxy instance -- a fixed host port, the AMQP
 # broker, the minikube cluster, the host's Docker image cache -- keyed by test file or class.
@@ -44,12 +42,38 @@ SHARED_RESOURCE_SCOPES = {
 }
 
 
+def shared_resource_scope(nodeid: str) -> str | None:
+    for prefix, scope in SHARED_RESOURCE_SCOPES.items():
+        if nodeid.startswith(f"{prefix}::"):
+            return scope
+    return None
+
+
 class SharedResourceScopeScheduling(LoadScopeScheduling):  # type: ignore[misc]  # pytest-xdist is untyped
     def _split_scope(self, nodeid: str) -> str:
-        for prefix, scope in SHARED_RESOURCE_SCOPES.items():
-            if nodeid.startswith(f"{prefix}::"):
-                return scope
-        return super()._split_scope(nodeid)
+        return shared_resource_scope(nodeid) or super()._split_scope(nodeid)
+
+
+def longest_scopes_first(items: list) -> list:
+    """Order items for --dist loadscope: the scopes with the most recorded work first.
+
+    Within a shared-resource scope, groups run in name order as they do in a serial run. Its tests
+    leave state behind for each other: test_containerized_jobs builds a mulled image that
+    test_container_resolvers expects to be absent from the Docker image cache.
+    """
+    durations = shard.load_durations()
+    scopes: dict[str, list] = defaultdict(list)
+    for item in items:
+        scopes[shared_resource_scope(item.nodeid) or shard.group_key(item)].append(item)
+
+    def seconds(scope_items: list) -> float:
+        group_keys = {shard.group_key(item) for item in scope_items}
+        return sum(durations.get(key, shard.DEFAULT_GROUP_SECONDS) for key in group_keys)
+
+    ordered = []
+    for _, scope_items in sorted(scopes.items(), key=lambda scope: (-seconds(scope[1]), scope[0])):
+        ordered.extend(sorted(scope_items, key=shard.group_key))
+    return ordered
 
 
 def pytest_configure(config):
@@ -57,6 +81,13 @@ def pytest_configure(config):
     shard.pytest_configure(config)
 
 
+@pytest.hookimpl(trylast=True)
+def pytest_collection_modifyitems(config, items):
+    shard.pytest_collection_modifyitems(config, items)
+    if os.environ.get("PYTEST_XDIST_WORKER"):
+        items[:] = longest_scopes_first(items)
+
+
 @pytest.hookimpl(optionalhook=True)
 def pytest_xdist_make_scheduler(config, log):
     if config.getvalue("dist") == "loadscope":