From 2efa3cecc129633c45811d0e1f2582fc67ca48ae Mon Sep 17 00:00:00 2001
From: Kurt Nistelberger <kurt.nistelberger@hotmail.com>
Date: Sat, 12 Nov 2022 06:50:09 +0100
Subject: [PATCH] CI: regroup devices (#26436)

* regroup ci devices

* cleanup looopback test

* split loopback devices

Co-authored-by: Kurt Nistelberger <kurt.nistelberger@gmail.com>
old-commit-hash: 5f094b836851c392b89429cc654082c659f7caec
---
 Jenkinsfile                            | 27 +++++++++++++++++++-------
 release/files_common                   |  1 +
 selfdrive/manager/test/test_manager.py |  6 ++++++
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 0d624954ea..696446c65f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -111,7 +111,7 @@ pipeline {
             R3_PUSH = "${env.BRANCH_NAME == 'master' ? '1' : ' '}"
           }
           steps {
-            phone_steps("tici", [
+            phone_steps("tici-needs-can", [
               ["build master-ci", "cd $SOURCE_DIR/release && TARGET_DIR=$TEST_DIR EXTRA_FILES='tools/' ./build_devel.sh"],
               ["build openpilot", "cd selfdrive/manager && ./build.py"],
               ["check dirty", "release/check-dirty.sh"],
@@ -122,16 +122,24 @@ pipeline {
           }
         }
 
+        stage('loopback-tests') {
+          agent { docker { image 'ghcr.io/commaai/alpine-ssh'; args '--user=root' } }
+          steps {
+            phone_steps("tici-loopback", [
+              ["build openpilot", "cd selfdrive/manager && ./build.py"],
+              ["test boardd loopback", "python selfdrive/boardd/tests/test_boardd_loopback.py"],
+            ])
+          }
+        }
+
         stage('HW + Unit Tests') {
           agent { docker { image 'ghcr.io/commaai/alpine-ssh'; args '--user=root' } }
           steps {
-            phone_steps("tici2", [
+            phone_steps("tici-common", [
               ["build", "cd selfdrive/manager && ./build.py"],
               ["test power draw", "python system/hardware/tici/test_power_draw.py"],
-              ["test boardd loopback", "python selfdrive/boardd/tests/test_boardd_loopback.py"],
               ["test loggerd", "python selfdrive/loggerd/tests/test_loggerd.py"],
               ["test encoder", "LD_LIBRARY_PATH=/usr/local/lib python selfdrive/loggerd/tests/test_encoder.py"],
-              ["test sensord", "python selfdrive/sensord/tests/test_sensord.py"],
               ["test pigeond", "python selfdrive/sensord/tests/test_pigeond.py"],
             ])
           }
@@ -159,27 +167,32 @@ pipeline {
           }
         }
 
-        stage('sensord (LSM-C)') {
+        stage('sensord') {
           agent { docker { image 'ghcr.io/commaai/alpine-ssh'; args '--user=root' } }
           steps {
             phone_steps("tici-lsmc", [
               ["build", "cd selfdrive/manager && ./build.py"],
               ["test sensord", "cd selfdrive/sensord/tests && python -m unittest test_sensord.py"],
             ])
+            phone_steps("tici-bmx-lsm", [
+              ["build", "cd selfdrive/manager && ./build.py"],
+              ["test sensord", "cd selfdrive/sensord/tests && python -m unittest test_sensord.py"],
+            ])
           }
         }
 
         stage('replay') {
           agent { docker { image 'ghcr.io/commaai/alpine-ssh'; args '--user=root' } }
           steps {
-            phone_steps("tici3", [
+            phone_steps("tici-common", [
               ["build", "cd selfdrive/manager && ./build.py"],
               ["model replay", "cd selfdrive/test/process_replay && ./model_replay.py"],
             ])
           }
         }
-      }
 
+      }
     }
+
   }
 }
diff --git a/release/files_common b/release/files_common
index 26662f1ef1..a294e1e5b5 100644
--- a/release/files_common
+++ b/release/files_common
@@ -95,6 +95,7 @@ selfdrive/boardd/panda_comms.h
 selfdrive/boardd/panda_comms.cc
 selfdrive/boardd/set_time.py
 selfdrive/boardd/pandad.py
+selfdrive/boardd/tests/test_boardd_loopback.py
 
 selfdrive/car/__init__.py
 selfdrive/car/docs_definitions.py
diff --git a/selfdrive/manager/test/test_manager.py b/selfdrive/manager/test/test_manager.py
index 7ac2c5f506..6d4df0423a 100755
--- a/selfdrive/manager/test/test_manager.py
+++ b/selfdrive/manager/test/test_manager.py
@@ -4,6 +4,7 @@ import signal
 import time
 import unittest
 
+from common.params import Params
 import selfdrive.manager.manager as manager
 from selfdrive.manager.process import DaemonProcess
 from selfdrive.manager.process_config import managed_processes
@@ -20,6 +21,10 @@ class TestManager(unittest.TestCase):
     os.environ['PASSIVE'] = '0'
     HARDWARE.set_power_save(False)
 
+    # ensure clean CarParams
+    params = Params()
+    params.clear_all()
+
   def tearDown(self):
     manager.manager_cleanup()
 
@@ -40,6 +45,7 @@ class TestManager(unittest.TestCase):
       Ensure all processes exit cleanly when stopped.
     """
     HARDWARE.set_power_save(False)
+    manager.manager_init()
     manager.manager_prepare()
     for p in ALL_PROCESSES:
       managed_processes[p].start()