Skip to content

Commit 0ef2c72

Browse files
improve HITL robustness (commaai#2333)
1 parent 24fe114 commit 0ef2c72

File tree

4 files changed

+7
-2
lines changed

4 files changed

+7
-2
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,6 @@ tests/safety/coverage.info
3737
*.profraw
3838
*.profdata
3939
mull.yml
40+
41+
.claude/
42+
TASK.md

Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ WORKDIR $WORKDIR
88

99
# deps install
1010
COPY pyproject.toml __init__.py setup.sh $WORKDIR
11-
RUN mkdir -p $WORKDIR/python/ && touch $WORKDIR/__init__.py
11+
RUN mkdir -p $WORKDIR/python/ $WORKDIR/board/body/ $WORKDIR/board/jungle/ && \
12+
touch $WORKDIR/__init__.py $WORKDIR/board/__init__.py $WORKDIR/board/body/__init__.py $WORKDIR/board/jungle/__init__.py
1213
RUN apt-get update && apt-get install -y --no-install-recommends sudo && DEBIAN_FRONTEND=noninteractive $WORKDIR/setup.sh
1314

1415
# second pass for the opendbc moving tag

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def docker_run(String step_label, int timeout_mins, String cmd) {
1515
def phone(String ip, String step_label, String cmd) {
1616
withCredentials([file(credentialsId: 'id_rsa', variable: 'key_file')]) {
1717
def ssh_cmd = """
18-
ssh -tt -o StrictHostKeyChecking=no -i ${key_file} 'comma@${ip}' /usr/bin/bash <<'END'
18+
ssh -tt -o StrictHostKeyChecking=no -o ConnectTimeout=30 -o ConnectionAttempts=3 -o ServerAliveInterval=10 -o ServerAliveCountMax=3 -i ${key_file} 'comma@${ip}' /usr/bin/bash <<'END'
1919
2020
set -e
2121

tests/hitl/conftest.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ def fixture_panda_setup(request):
148148
init_jungle()
149149

150150
# init panda
151+
assert Panda.wait_for_panda(_panda_serial, timeout=10), "panda not found"
151152
p = Panda(serial=_panda_serial)
152153
p.reset(reconnect=True)
153154

0 commit comments

Comments
 (0)