From 39da6912ea0b8db16d3f96f289f723452e540ab7 Mon Sep 17 00:00:00 2001
From: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Date: Sun, 12 Jun 2022 18:00:00 -0700
Subject: [PATCH] misc jenkins fixups (#24840)

* bump cereal

* remove that

* pull cl image

* lil docker cleanup
---
 Dockerfile.openpilot                   |  7 +------
 cereal                                 |  2 +-
 selfdrive/manager/test/test_manager.py |  8 ++------
 tools/sim/Dockerfile.sim               | 10 +++++-----
 tools/sim/build_container.sh           |  2 +-
 5 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/Dockerfile.openpilot b/Dockerfile.openpilot
index 66b9f18a11..102da78d7d 100644
--- a/Dockerfile.openpilot
+++ b/Dockerfile.openpilot
@@ -8,11 +8,6 @@ ENV PYTHONPATH ${OPENPILOT_PATH}:${PYTHONPATH}
 RUN mkdir -p ${OPENPILOT_PATH}
 WORKDIR ${OPENPILOT_PATH}
 
-COPY Pipfile Pipfile.lock $OPENPILOT_PATH
-RUN pip install --no-cache-dir pipenv==2021.5.29 pip==21.3.1 && \
-    pipenv install --system --deploy --dev --clear && \
-    pip uninstall -y pipenv
-
 COPY SConstruct ${OPENPILOT_PATH}
 
 COPY ./pyextra ${OPENPILOT_PATH}/pyextra
@@ -30,4 +25,4 @@ COPY ./panda ${OPENPILOT_PATH}/panda
 COPY ./selfdrive ${OPENPILOT_PATH}/selfdrive
 COPY ./system ${OPENPILOT_PATH}/system
 
-RUN scons -j$(nproc)
+RUN scons --cache-readonly -j$(nproc)
diff --git a/cereal b/cereal
index 78870ba056..98f795fd73 160000
--- a/cereal
+++ b/cereal
@@ -1 +1 @@
-Subproject commit 78870ba056174352218988610e5010fde4eca956
+Subproject commit 98f795fd73356198f1fc8d5ea5a8f25e6f7c57e0
diff --git a/selfdrive/manager/test/test_manager.py b/selfdrive/manager/test/test_manager.py
index e4c3ef7c4c..a84ff264d2 100755
--- a/selfdrive/manager/test/test_manager.py
+++ b/selfdrive/manager/test/test_manager.py
@@ -5,14 +5,13 @@ import time
 import unittest
 
 import selfdrive.manager.manager as manager
-from system.hardware import AGNOS, HARDWARE
 from selfdrive.manager.process import DaemonProcess
 from selfdrive.manager.process_config import managed_processes
+from system.hardware import AGNOS, HARDWARE
 
 os.environ['FAKEUPLOAD'] = "1"
 
-# TODO: make eon fast
-MAX_STARTUP_TIME = 15
+MAX_STARTUP_TIME = 3
 ALL_PROCESSES = [p.name for p in managed_processes.values() if (type(p) is not DaemonProcess) and p.enabled and (p.name not in ['updated', 'pandad'])]
 
 
@@ -54,9 +53,6 @@ class TestManager(unittest.TestCase):
         # TODO: make Qt UI exit gracefully
         continue
 
-      # Make sure the process is actually dead
-      managed_processes[p].stop()
-
       # TODO: interrupted blocking read exits with 1 in cereal. use a more unique return code
       exit_codes = [0, 1]
       if managed_processes[p].sigkill:
diff --git a/tools/sim/Dockerfile.sim b/tools/sim/Dockerfile.sim
index d838efed13..0d6e8e584c 100644
--- a/tools/sim/Dockerfile.sim
+++ b/tools/sim/Dockerfile.sim
@@ -1,9 +1,9 @@
 FROM ghcr.io/commaai/openpilot-base-cl:latest
 
-RUN apt-get update && apt-get install -y --no-install-recommends\
-    tmux \
-    vim \
-  && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y --no-install-recommends \
+      tmux \
+      vim \
+    && rm -rf /var/lib/apt/lists/*
 
 # get same tmux config used on NEOS for debugging
 RUN cd $HOME && \
@@ -27,6 +27,6 @@ COPY ./system $HOME/openpilot/system
 COPY ./tools $HOME/openpilot/tools
 
 WORKDIR $HOME/openpilot
-RUN scons -j12
+RUN scons --cache-readonly -j12
 
 RUN python -c "from selfdrive.test.helpers import set_params_enabled; set_params_enabled()"
diff --git a/tools/sim/build_container.sh b/tools/sim/build_container.sh
index 451277d590..81afb82d83 100755
--- a/tools/sim/build_container.sh
+++ b/tools/sim/build_container.sh
@@ -3,7 +3,7 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd $DIR/../../
 
-docker pull ghcr.io/commaai/openpilot-base:latest
+docker pull ghcr.io/commaai/openpilot-base-cl:latest
 docker build \
   --cache-from ghcr.io/commaai/openpilot-sim:latest \
   -t ghcr.io/commaai/openpilot-sim:latest \