From df9898673e1dacdc92c7edd4957fd4c17ca26bc0 Mon Sep 17 00:00:00 2001
From: firestar5683 <168790843+firestar5683@users.noreply.github.com>
Date: Fri, 30 Oct 2026 03:34:54 -0500
Subject: [PATCH] Stabilize GM startup test collection across CI shards

---
 openpilot/starpilot/aol/tests/test_gm.py | 8 ++++----
 prebuilt.json                            | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/openpilot/starpilot/aol/tests/test_gm.py b/openpilot/starpilot/aol/tests/test_gm.py
index 3a147fce38..7d6fa1973e 100644
--- a/openpilot/starpilot/aol/tests/test_gm.py
+++ b/openpilot/starpilot/aol/tests/test_gm.py
@@ -57,7 +57,7 @@ def _configurations():
     disabled = cp.as_reader().as_builder()
     VehicleStartupPreferences(disable_bolt_long=True).prepare(disabled)
     yield disabled
-  for identity in GM_BASE_GATEWAY_IDS:
+  for identity in sorted(GM_BASE_GATEWAY_IDS):
     cp = ordinary_params(identity, radar=True)
     yield cp
     if identity == CAR.BUICK_LACROSSE:
@@ -102,12 +102,12 @@ def _configurations():
   from opendbc.car.gm.tests.test_conventional_pedal import params as conventional_pedal
   from opendbc.car.gm.tests.test_silverado_cc_pedal import params as silverado_pedal
   from opendbc.car.gm.tests.test_camera_acc_pedal import params as camera_pedal
-  for identity in ORDINARY_ASCM_CAR | ORDINARY_SDGM_CAR:
+  for identity in sorted(ORDINARY_ASCM_CAR | ORDINARY_SDGM_CAR):
     for alpha in (False, True):
       for c9 in (False, True):
         for radar in (False, True):
           yield intercept_params(identity, sascm=True, accelerator=not c9, radar=radar, alpha=alpha)
-  for identity in ORDINARY_CAMERA_CAR:
+  for identity in sorted(ORDINARY_CAMERA_CAR):
     for alpha in (False, True):
       for analog in (False, True):
         yield ordinary_camera(identity, alpha=alpha, be=analog)
@@ -123,7 +123,7 @@ def _configurations():
     disabled = cp.as_reader().as_builder()
     VehicleStartupPreferences(disable_bolt_long=True).prepare(disabled)
     yield disabled
-  for identity in ORDINARY_CC_CAR:
+  for identity in sorted(ORDINARY_CC_CAR):
     yield intercept_params(identity)
     for removed in (False, True):
       for disabled in (False, True):
diff --git a/prebuilt.json b/prebuilt.json
index ccc9a796ae..4d56174ec2 100644
--- a/prebuilt.json
+++ b/prebuilt.json
@@ -1 +1 @@
-{"protected_inventory_sha256": "a761a45fe946c502ca6caedd82964f08882010c30929ef21853c9ca10360b01f", "schema_version": 1}
+{"protected_inventory_sha256": "4f3ea7b8b09f1fcd7a44eb9aa53a2c3da515a7b4bb4ab21b6c1881c6dad89a59", "schema_version": 1}