From 60d2a28fbed6b209fb42b4aac47cda665dd84a8f Mon Sep 17 00:00:00 2001 From: patrikwilliam <56090958+patrikwilliam@users.noreply.github.com> Date: Sat, 30 Nov 2024 11:12:50 +0100 Subject: [PATCH] preserve shards ordering (#558) Co-authored-by: Mikko Korpela --- src/pabot/pabot.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pabot/pabot.py b/src/pabot/pabot.py index b5e3dd31..ebddc262 100644 --- a/src/pabot/pabot.py +++ b/src/pabot/pabot.py @@ -1976,10 +1976,10 @@ def main_program(args): def _group_suites(outs_dir, datasources, options, pabot_args): suite_names = solve_suite_names(outs_dir, datasources, options, pabot_args) _verify_depends(suite_names) - shard_suites = solve_shard_suites(suite_names, pabot_args) - ordered_suites = _preserve_order(shard_suites, pabot_args.get("ordering")) + ordered_suites = _preserve_order(suite_names, pabot_args.get("ordering")) + shard_suites = solve_shard_suites(ordered_suites, pabot_args) grouped_suites = ( - _chunked_suite_names(ordered_suites, pabot_args["processes"]) + _chunked_suite_names(shard_suites, pabot_args["processes"]) if pabot_args["chunk"] else _group_by_wait(_group_by_groups(ordered_suites)) )