Inherit appropiate environment variables in goma module for goma_utils.py

scripts/slave/recipe_modules/goma/api.py

Index: scripts/slave/recipe_modules/goma/api.py
diff --git a/scripts/slave/recipe_modules/goma/api.py b/scripts/slave/recipe_modules/goma/api.py
index db1b0061f82875595c795a87a8aaae0adf1407aa..3c42e2175c5128497519b0993b2bc79cbbf4e9ed 100644
--- a/scripts/slave/recipe_modules/goma/api.py
+++ b/scripts/slave/recipe_modules/goma/api.py
@@ -2,6 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import os
+
 from recipe_engine import recipe_api
 
 class GomaApi(recipe_api.RecipeApi):
@@ -12,8 +14,20 @@ class GomaApi(recipe_api.RecipeApi):
     self._goma_dir = None
     self._goma_started = False
 
+    self.goma_ctl_env_init()
+
+
+  def goma_ctl_env_init(self):
     self._goma_ctl_env = {}
 
+    # inherit some env vars used in goma_utils.SendGomaTsMon
+    for key in ['BUILDBOD_BUILDERNAME',
+                'BUILDBOT_MASTERNAME',
+                'BUILDBOT_SLAVENAME',
+                'BUILDBOT_CLOBBER',
+    ]:
+      self._goma_ctl_env[key] = os.environ.get(key, 'unknown')
+
   @property
   def service_account_json_path(self):
     if self.m.platform.is_win:
@@ -69,6 +83,9 @@ class GomaApi(recipe_api.RecipeApi):
     self._goma_ctl_env['GOMA_SERVICE_ACCOUNT_JSON_FILE'] = (
         self.service_account_json_path)
 
+    assert env is None or 'GOMA_TMP_DIR' not in env
+    self._goma_ctl_env['GOMA_TMP_DIR'] = self.m.path.mkdtemp('goma_tmp_dir')

[ukai, 2016/08/12 04:22:30]

can we make sure all gomacc invocation will have the same environment?

if it wants to change logging directory only, might be better to use
GLOG_log_dir?

[tikuta, 2016/08/12 04:55:27]

I changed to use GLOG_log_dir instead of GOMA_TMP_DIR and modified goma_utils
for it.

+
     goma_ctl_start_env = self._goma_ctl_env.copy()
 
     if env is not None:
@@ -112,7 +129,8 @@ class GomaApi(recipe_api.RecipeApi):
                      ninja_log_exit_status)
 
     self._goma_started = False
-    self._goma_ctl_env = {}
+    self.goma_ctl_env_init()
+
 
   def upload_logs(self, ninja_log_outdir=None, ninja_log_compiler=None,
                   ninja_log_command=None, ninja_log_exit_status=None,
@@ -145,5 +163,6 @@ class GomaApi(recipe_api.RecipeApi):
       name=name or 'upload_log',
       script=self.package_repo_resource(
           'scripts', 'slave', 'upload_goma_logs.py'),
-      args=args
+      args=args,
+      env=self._goma_ctl_env
     )