From d231b3a7ec5730b9e34c613f74298a5b5172626a Mon Sep 17 00:00:00 2001
From: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Date: Wed, 10 Jun 2020 17:48:51 -0700
Subject: [PATCH] don't clear scons cache in CI

old-commit-hash: cf72a4eb34287218f385e75849902755203d55ec
---
 selfdrive/manager.py                           | 16 ++++++++++------
 selfdrive/test/process_replay/camera_replay.py |  1 +
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/selfdrive/manager.py b/selfdrive/manager.py
index fcf75ff1c9..9c4fbc3d57 100755
--- a/selfdrive/manager.py
+++ b/selfdrive/manager.py
@@ -123,12 +123,16 @@ if not prebuilt:
       compile_output += r
 
       if retry:
-        print("scons build failed, cleaning in")
-        for i in range(3, -1, -1):
-          print("....%d" % i)
-          time.sleep(1)
-        subprocess.check_call(["scons", "-c"], cwd=BASEDIR, env=env)
-        shutil.rmtree("/tmp/scons_cache")
+        if not os.getenv("CI"):
+          print("scons build failed, cleaning in")
+          for i in range(3, -1, -1):
+            print("....%d" % i)
+            time.sleep(1)
+          subprocess.check_call(["scons", "-c"], cwd=BASEDIR, env=env)
+          shutil.rmtree("/tmp/scons_cache")
+        else:
+          print("scons build failed after retry")
+          sys.exit(1)
       else:
         # Build failed log errors
         errors = [line.decode('utf8', 'replace') for line in compile_output
diff --git a/selfdrive/test/process_replay/camera_replay.py b/selfdrive/test/process_replay/camera_replay.py
index e2cb8cd9e2..da277dd7cb 100755
--- a/selfdrive/test/process_replay/camera_replay.py
+++ b/selfdrive/test/process_replay/camera_replay.py
@@ -6,6 +6,7 @@ from typing import Any
 from tqdm import tqdm
 
 from common.android import ANDROID
+os.environ['CI'] = "1"
 if ANDROID:
   os.environ['QCOM_REPLAY'] = "1"
 import selfdrive.manager as manager