Skip to content

Commit c35ec97

Browse files
adeebshihadehspektor56
authored andcommitted
misc jenkins fixups (commaai#24840)
* bump cereal * remove that * pull cl image * lil docker cleanup
1 parent 7c5760b commit c35ec97

File tree

4 files changed

+4
-11
lines changed

4 files changed

+4
-11
lines changed

Dockerfile.openpilot

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@ ENV PYTHONPATH ${OPENPILOT_PATH}:${PYTHONPATH}
88
RUN mkdir -p ${OPENPILOT_PATH}
99
WORKDIR ${OPENPILOT_PATH}
1010

11-
COPY Pipfile Pipfile.lock $OPENPILOT_PATH
12-
RUN pip install --no-cache-dir pipenv==2021.5.29 pip==21.3.1 && \
13-
pipenv install --system --deploy --dev --clear && \
14-
pip uninstall -y pipenv
15-
1611
COPY SConstruct ${OPENPILOT_PATH}
1712

1813
COPY ./pyextra ${OPENPILOT_PATH}/pyextra
@@ -30,4 +25,4 @@ COPY ./panda ${OPENPILOT_PATH}/panda
3025
COPY ./selfdrive ${OPENPILOT_PATH}/selfdrive
3126
COPY ./system ${OPENPILOT_PATH}/system
3227

33-
RUN scons -j$(nproc)
28+
RUN scons --cache-readonly -j$(nproc)

selfdrive/manager/test/test_manager.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
from system.hardware import EON, TICI, HARDWARE
99
from selfdrive.manager.process import DaemonProcess
1010
from selfdrive.manager.process_config import managed_processes
11+
from system.hardware import AGNOS, HARDWARE
1112

1213
os.environ['FAKEUPLOAD'] = "1"
1314

@@ -54,9 +55,6 @@ def test_clean_exit(self):
5455
# TODO: make Qt UI exit gracefully
5556
continue
5657

57-
# Make sure the process is actually dead
58-
managed_processes[p].stop()
59-
6058
# TODO: interrupted blocking read exits with 1 in cereal. use a more unique return code
6159
exit_codes = [0, 1]
6260
if managed_processes[p].sigkill:

tools/sim/Dockerfile.sim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ COPY ./system $HOME/openpilot/system
4242
COPY ./tools $HOME/openpilot/tools
4343

4444
WORKDIR $HOME/openpilot
45-
RUN scons -j$(nproc)
45+
RUN scons --cache-readonly -j12
4646

4747
RUN python -c "from selfdrive.test.helpers import set_params_enabled; set_params_enabled()"

tools/sim/build_container.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
44
cd $DIR/../../
55

6-
docker pull ghcr.io/commaai/openpilot-base:latest
6+
docker pull ghcr.io/commaai/openpilot-base-cl:latest
77
docker build \
88
--cache-from ghcr.io/commaai/openpilot-sim:latest \
99
-t ghcr.io/commaai/openpilot-sim:latest \

0 commit comments

Comments
 (0)