commit 2e6738447eba9c0858ddbd8001e59812838d26f8
author Ben Segall <bentekkie@google.com> Wed Jun 21 14:23:37 2023 +0000
committer LUCI CQ <infra-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Jun 21 14:23:37 2023 +0000
tree e36c24a0a5a964fe90f3d386b034d831303a9fc4
parent 4ec095fa85b7c7a748e3e58f3eef19e4bab80f5f

reclient: Clear log dir between builds

Bug: b/287650736
Change-Id: I87c0226f428211ac99520b024edeaf5ccb6a674c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4629861
Commit-Queue: Ben Segall <bentekkie@google.com>
Reviewed-by: Takuto Ikuta <tikuta@chromium.org>
Auto-Submit: Ben Segall <bentekkie@google.com>

reclient_helper.py

diff --git a/reclient_helper.py b/reclient_helper.py
index 9668e1e..6b1ff37 100644
--- a/reclient_helper.py
+++ b/reclient_helper.py
@@ -9,6 +9,7 @@
 import contextlib
 import hashlib
 import os
+import shutil
 import subprocess
 import sys
 
@@ -142,6 +143,9 @@
   log_dir = os.path.join(tmp_dir, 'logs')
   cache_dir = find_cache_dir(tmp_dir)
   if make_dirs:
+    if os.path.exists(log_dir):
+      # Clear log dir before each build to ensure correct metric aggregation.
+      shutil.rmtree(log_dir)
     os.makedirs(tmp_dir, exist_ok=True)
     os.makedirs(log_dir, exist_ok=True)
     os.makedirs(cache_dir, exist_ok=True)