Reland "Avoid to use environment."

scripts/slave/compile.py

Index: scripts/slave/compile.py
diff --git a/scripts/slave/compile.py b/scripts/slave/compile.py
index 30bea0b3dcd24d2534f7dab5925a0987aa052736..e68649cebd3496e16bfd6eb8c736b7cbae14b04b 100755
--- a/scripts/slave/compile.py
+++ b/scripts/slave/compile.py
@@ -87,7 +87,11 @@ def StopGomaClientAndUploadInfo(options, env, exit_status):
   if options.goma_jsonstatus:
     chromium_utils.RunCommand(
         goma_ctl_cmd + ['jsonstatus', options.goma_jsonstatus], env=env)
-    goma_utils.SendGomaTsMon(options.goma_jsonstatus, exit_status)
+    goma_utils.SendGomaTsMon(options.goma_jsonstatus, exit_status,
+                             builder=options.buildbot_buildername,
+                             master=options.buildbot_mastername,
+                             slave=options.buildbot_slavename,
+                             clobber=options.buildbot_clobber)
 
   # If goma compiler_proxy crashes, there could be crash dump.
   if options.build_data_dir:
@@ -506,6 +510,15 @@ def get_parsed_options():
   option_parser.add_option('--cloudtail-pid-file', default=None,
                            help='Specify a file to store pid of cloudtail')
 
+  # Arguments to pass buildbot properties.
+  option_parser.add_option('--buildbot-buildername', default='unknown',
+                           help='buildbot buildername')
+  option_parser.add_option('--buildbot-mastername', default='unknown',
+                           help='buildbot mastername')
+  option_parser.add_option('--buildbot-slavename', default='unknown',
+                           help='buildbot slavename')
+  option_parser.add_option('--buildbot-clobber', help='buildbot clobber')

[Nico, 2016/12/07 19:03:24]

Why is this needed? compile.py should never clobber (except on 3 bots using
legacy systems), see
https://bugs.chromium.org/p/chromium/issues/detail?id=617604

[yyanagisawa, 2016/12/08 01:41:01]

This flags is needed to make goma_utils know this build is clobber build.  As
far as I understand, chromium builder does clobber build but we do not do
anything special for clobber build in compile.py (by removing --clobber).  The
flag also does not affects how --clobber works.

However, this misleading should be caused by making compile.py do several jobs,
starting goma compiler_proxy, run ninja, stop goma compiler_proxy, and upload
logs.  If we factor out goma-related code from compile.py, compile.py do not
need to have the misleading option.

By the way, I understand that is what Takuto is trying to do, recently.

+
   options, args = option_parser.parse_args()
 
   if not options.src_dir: