Revert "test_models: fallback to public route when route isn't uploaded to CI bucket (#30794)" (#30896)

* fails if no skip function

* Revert "fails if no skip function"

This reverts commit ff3d697d38.

* Revert "test_models: fallback to public route when route isn't uploaded to CI bucket (#30794)"

This reverts commit 05dc0b51e6.

selfdrive/car/tests/test_models.py

@@ -37,7 +37,6 @@ INTERNAL_SEG_LIST = os.environ.get("INTERNAL_SEG_LIST", "")
 INTERNAL_SEG_CNT = int(os.environ.get("INTERNAL_SEG_CNT", "0"))
 MAX_EXAMPLES = int(os.environ.get("MAX_EXAMPLES", "50"))
 
-CI = os.environ.get("CI", None) is not None
 
 def get_test_cases() -> List[Tuple[str, Optional[CarTestRoute]]]:
   # build list of test cases
@@ -68,33 +67,13 @@ def get_test_cases() -> List[Tuple[str, Optional[CarTestRoute]]]:
 class TestCarModelBase(unittest.TestCase):
   car_model: Optional[str] = None
   test_route: Optional[CarTestRoute] = None
-  test_route_on_bucket: bool = True # whether the route is on the preserved CI bucket
+  ci: bool = True
 
   can_msgs: List[capnp.lib.capnp._DynamicStructReader]
   fingerprint: dict[int, dict[int, int]]
   elm_frame: Optional[int]
   car_safety_mode_frame: Optional[int]
 
-  @classmethod
-  def get_logreader(cls, seg):
-    if len(INTERNAL_SEG_LIST):
-      route_name = RouteName(cls.test_route.route)
-      return LogReader(f"cd:/{route_name.dongle_id}/{route_name.time_str}/{seg}/rlog.bz2")
-    else:
-      # Attempt to use CI bucket first
-      try:
-        return LogReader(get_url(cls.test_route.route, seg))
-      except Exception:
-        cls.test_route_on_bucket = False
-
-      # Fallback to public route, which will fail the test_route_on_ci_bucket when running in CI
-      try:
-        return LogReader(Route(cls.test_route.route).log_paths()[seg])
-      except Exception:
-        pass
-
-      raise Exception("Unable to get route. Check that the route is valid, and either public or uploaded to the CI bucket.")
-
   @classmethod
   def setUpClass(cls):
     if cls.__name__ == 'TestCarModel' or cls.__name__.endswith('Base'):
@@ -116,7 +95,13 @@ class TestCarModelBase(unittest.TestCase):
 
     for seg in test_segs:
       try:
-        lr = cls.get_logreader(seg)
+        if len(INTERNAL_SEG_LIST):
+          route_name = RouteName(cls.test_route.route)
+          lr = LogReader(f"cd:/{route_name.dongle_id}/{route_name.time_str}/{seg}/rlog.bz2")
+        elif cls.ci:
+          lr = LogReader(get_url(cls.test_route.route, seg))
+        else:
+          lr = LogReader(Route(cls.test_route.route).log_paths()[seg])
       except Exception:
         continue
 
@@ -160,7 +145,7 @@ class TestCarModelBase(unittest.TestCase):
       if len(can_msgs) > int(50 / DT_CTRL):
         break
     else:
-      raise Exception(f"Route: {repr(cls.test_route.route)} with segments: {test_segs} not found or no CAN msgs found. Is it uploaded and public?")
+      raise Exception(f"Route: {repr(cls.test_route.route)} with segments: {test_segs} not found or no CAN msgs found. Is it uploaded?")
 
     # if relay is expected to be open in the route
     cls.openpilot_enabled = cls.car_safety_mode_frame is not None
@@ -466,11 +451,6 @@ class TestCarModelBase(unittest.TestCase):
     failed_checks = {k: v for k, v in checks.items() if v > 0}
     self.assertFalse(len(failed_checks), f"panda safety doesn't agree with openpilot: {failed_checks}")
 
-  @pytest.mark.skipif(not CI, reason="When running in CI we want to make sure all the routes are uploaded to the preserved CI bucket.")
-  def test_route_on_ci_bucket(self):
-    assert self.test_route_on_bucket, "Route not on CI bucket. \
-                                       This is fine to fail for WIP car ports, just let us know and we can upload your routes to the CI bucket."
-
 
 @parameterized_class(('car_model', 'test_route'), get_test_cases())
 @pytest.mark.xdist_group_class_property('test_route')