Merge 9d681db03f into 9d17c73f6b

.github/workflows/selfdrive_tests.yaml

@@ -232,16 +232,16 @@ jobs:
       with:
         path: .ci_cache/comma_download_cache
         key: car_models-${{ hashFiles('selfdrive/car/tests/test_models.py', 'opendbc/car/tests/routes.py') }}-${{ matrix.job }}
+    - name: Check submodules
+      timeout-minutes: 3
+      run: release/check-submodules.sh
     - name: Build openpilot
       run: ${{ env.RUN }} "scons -j$(nproc)"
     - name: Test car models
-      timeout-minutes: ${{ contains(runner.name, 'nsc') && (steps.routes-cache.outputs.cache-hit == 'true') && 1 || 6 }}
+      timeout-minutes: 15
       run: |
         ${{ env.RUN }} "MAX_EXAMPLES=1 $PYTEST selfdrive/car/tests/test_models.py && \
                         chmod -R 777 /tmp/comma_download_cache"
-      env:
-        NUM_JOBS: 4
-        JOB_ID: ${{ matrix.job }}
     - name: "Upload coverage to Codecov"
       uses: codecov/codecov-action@v4
       with:

.gitmodules

@@ -1,9 +1,9 @@
 [submodule "panda"]
   path = panda
-  url = ../../commaai/panda.git
+  url = https://github.com/aubsw/panda.git
 [submodule "opendbc"]
   path = opendbc_repo
-  url = ../../commaai/opendbc.git
+  url = https://github.com/aubsw/opendbc.git
 [submodule "msgq"]
   path = msgq_repo
   url = ../../commaai/msgq.git

release/check-submodules.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -x
 
 while read hash submodule ref; do
   if [ "$submodule" = "tinygrad_repo" ]; then
@@ -6,6 +7,22 @@ while read hash submodule ref; do
     continue
   fi
 
+  if [ "$submodule" = "opendbc_repo" ]; then
+    git -C $submodule fetch origin e932b98abd16554246012c79007657d8903805bd
+    git -C $submodule checkout FETCH_HEAD
+    cat opendbc_repo/opendbc/safety/tests/libsafety/safety_helpers.py | grep ignition
+    ls -la opendbc
+    echo "$submodule ok (custom Aubrey version)"
+    continue
+  fi
+
+  if [ "$submodule" = "panda" ]; then
+    git -C $submodule fetch origin c66e9a46349d152199a4a0997f82f0bea3c9b5a6
+    git -C $submodule checkout FETCH_HEAD
+    echo "$submodule ok (custom Aubrey version)"
+    continue
+  fi
+
   git -C $submodule fetch --depth 100 origin master
   git -C $submodule branch -r --contains $hash | grep "origin/master"
   if [ "$?" -eq 0 ]; then

selfdrive/car/tests/big_cars_test.sh

@@ -7,6 +7,6 @@ cd $BASEDIR
 export MAX_EXAMPLES=300
 export INTERNAL_SEG_CNT=300
 export FILEREADER_CACHE=1
-export INTERNAL_SEG_LIST=selfdrive/car/tests/test_models_segs.txt
+export INTERNAL_SEG_LIST=selfdrive/car/tests/test_models_segs_smol.txt
 
 cd selfdrive/car/tests && pytest test_models.py test_car_interfaces.py

selfdrive/car/tests/test_models.py

@@ -243,6 +243,9 @@ class TestCarModelBase(unittest.TestCase):
         if self.safety.safety_rx_hook(to_send) != 1:
           failed_addrs[hex(msg.address)] += 1
 
+        if self.CP.brand not in ("gm", "mazda", "rivian", "tesla"):
+          self.assertFalse(self.safety.get_ignition_can())
+
       # ensure all msgs defined in the addr checks are valid
       self.safety.safety_tick_current_safety_config()
       if t > 1e6:

selfdrive/car/tests/test_models_segs_smol.txt

@@ -0,0 +1,7 @@
+# MAZDA CX-5 2022
+066b8ed7a80184fb|2023-06-13--23-33-37--62
+# TESLA AP2 MODEL S
+7277bddf4748e615|2023-05-10--10-30-06--11
+# CHEVROLET VOLT PREMIER 2017
+dcaf04bb53a1f9df|2023-06-02--10-08-55--1
+# ...Why is there no Rivian :(