commit 4ccfb08a648fe645f275f6823d30942e20d55141
author Michael Mortensen <mmortensen@google.com> Wed Jan 22 16:24:03 2020 -0700
committer Commit Bot <commit-bot@chromium.org> Fri Jan 24 01:47:51 2020 +0000
tree 7e33c29aabf144f3abae3880b6d61922b08aed52
parent 880671bfa866ddd170730bcdb6874b37257f009b

Use goma env variable for goma-created temp log dir.

BUG=chromium:1013499
TEST=run_tests

Change-Id: I43190754e7e15d2e0e300c75bdce67dbb100c801
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2015339
Reviewed-by: Alex Klein <saklein@chromium.org>
Tested-by: Michael Mortensen <mmortensen@google.com>
Commit-Queue: Michael Mortensen <mmortensen@google.com>

api/controller/controller_util.py

diff --git a/api/controller/controller_util.py b/api/controller/controller_util.py
index ac15052..ba4031b 100644
--- a/api/controller/controller_util.py
+++ b/api/controller/controller_util.py
@@ -7,8 +7,6 @@
 
 from __future__ import print_function
 
-import os
-
 from chromite.api.gen.chromiumos import common_pb2
 from chromite.cbuildbot import goma_util
 from chromite.lib import constants
@@ -78,10 +76,8 @@
     goma_approach = goma_util.GomaApproach('?staging',
                                            'staging-goma.chromium.org', True)
 
-  log_dir = goma_message.log_dir.dir or None
-  if log_dir:
-    log_dir = os.path.join(chroot_path, log_dir.lstrip(os.sep))
-
+  # Note that we are not specifying the goma log_dir so that goma will create
+  # and use a tmp dir for the logs.
   stats_filename = goma_message.stats_file or None
   counterz_filename = goma_message.counterz_file or None
 
@@ -91,7 +87,6 @@
                         chromeos_goma_dir=chromeos_goma_dir,
                         chroot_dir=chroot_path,
                         goma_approach=goma_approach,
-                        log_dir=log_dir,
                         stats_filename=stats_filename,
                         counterz_filename=counterz_filename)