diff --git a/Jenkinsfile b/Jenkinsfile index a771ff53..da692afe 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -101,6 +101,18 @@ pipeline { stage('parallel tests') { parallel { + stage('test cuatro') { + agent { docker { image 'ghcr.io/commaai/alpine-ssh'; args '--user=root' } } + steps { + phone_steps("panda-cuatro", [ + ["build", "scons -j4"], + ["flash", "cd scripts/ && ./reflash_internal_panda.py"], + ["flash jungle", "cd board/jungle && ./flash.py --all"], + ["test", "cd tests/hitl && HW_TYPES=10 pytest -n0 --durations=0 2*.py [5-9]*.py"], + ]) + } + } + stage('test tres') { agent { docker { image 'ghcr.io/commaai/alpine-ssh'; args '--user=root' } } steps { diff --git a/python/__init__.py b/python/__init__.py index 39f0d0a7..077358ea 100644 --- a/python/__init__.py +++ b/python/__init__.py @@ -143,7 +143,7 @@ class Panda: HW_TYPE_UNO: 5100, HW_TYPE_DOS: 6500, HW_TYPE_TRES: 6600, - HW_TYPE_CUATRO: 6600, + HW_TYPE_CUATRO: 12500, } HARNESS_STATUS_NC = 0 diff --git a/tests/hitl/7_internal.py b/tests/hitl/7_internal.py index eb8577fb..aad62bad 100644 --- a/tests/hitl/7_internal.py +++ b/tests/hitl/7_internal.py @@ -44,7 +44,7 @@ def test_fan_cooldown(p): time.sleep(3) p.set_fan_power(0) for _ in range(5): - assert p.get_fan_rpm() <= 7000 + assert p.get_fan_rpm() <= Panda.MAX_FAN_RPMs[bytes(p.get_type())] time.sleep(0.5) def test_fan_overshoot(p):