From fc69b28f7e89e9890506e4d0e5479df226fc240f Mon Sep 17 00:00:00 2001
From: Justin Newberry <justin@comma.ai>
Date: Sun, 24 Sep 2023 17:24:44 -0700
Subject: [PATCH] Devcontainer: improve CI tests and support using local built
 image (#30012)

* improve devcontainer tests

* test full build with cache

* fix that

* fix the cache

* fix the cache
old-commit-hash: 003018fc468c3a0a902160413ea5f5d434a987b9
---
 .devcontainer/host_setup.sh        |  4 +++-
 .github/workflows/tools_tests.yaml | 15 +++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/.devcontainer/host_setup.sh b/.devcontainer/host_setup.sh
index e8a0781a2c..b3119185a4 100755
--- a/.devcontainer/host_setup.sh
+++ b/.devcontainer/host_setup.sh
@@ -1,7 +1,9 @@
 #!/usr/bin/env bash
 
 # pull base image
-docker pull ghcr.io/commaai/openpilot-base:latest
+if [[ -z $USE_LOCAL_IMAGE ]]; then
+  docker pull ghcr.io/commaai/openpilot-base:latest
+fi
 
 # setup .host dir
 mkdir -p .devcontainer/.host
diff --git a/.github/workflows/tools_tests.yaml b/.github/workflows/tools_tests.yaml
index c7a5f80c3b..1dea47f638 100644
--- a/.github/workflows/tools_tests.yaml
+++ b/.github/workflows/tools_tests.yaml
@@ -90,11 +90,22 @@ jobs:
     - uses: actions/checkout@v3
       with:
         submodules: true
+    - uses: ./.github/workflows/setup-with-retry
+      with:
+        git_lfs: false
+    - name: Use local image for testing devcontainer with latest base image
+      run: |
+        echo "USE_LOCAL_IMAGE=true" >> "$GITHUB_ENV"
     - name: Setup Dev Container CLI
       run: npm install -g @devcontainers/cli
     - name: Build dev container image
       run: devcontainer build --workspace-folder .
     - name: Run dev container
-      run: devcontainer up --workspace-folder .
+      run: |
+        mkdir -p /tmp/devcontainer_scons_cache/
+        cp -r $GITHUB_WORKSPACE/.ci_cache/scons_cache/* /tmp/devcontainer_scons_cache/
+        devcontainer up --workspace-folder .
     - name: Test environment
-      run: devcontainer exec --workspace-folder . scons --dry-run
+      run: |
+        devcontainer exec --workspace-folder . scons -j$(nproc)
+        devcontainer exec --workspace-folder . pip install pip-install-test