Reland "Avoid to use environment."

scripts/slave/compile.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """A tool to build chrome, executed by buildbot.
 
   When this is run, the current directory (cwd) should be the outer build
   directory (e.g., chrome-release/build/).
 
@@ skipping 69 matching lines @@
     options (Option) : options to specify where to store goma-related info.
     env (dict)       : used when goma_ctl command executes.
     exit_status (int): exit_status sent to monitoring system.
   """
   goma_ctl_cmd = [sys.executable,
                   os.path.join(options.goma_dir, 'goma_ctl.py')]
 
   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:
     env['GOMACTL_CRASH_REPORT_ID_FILE'] = os.path.join(options.build_data_dir,
                                                        'crash_report_id_file')
   # We must stop the proxy to dump GomaStats.
   chromium_utils.RunCommand(goma_ctl_cmd + ['stop'], env=env)
   override_gsutil = None
   if options.gsutil_py_path:
     override_gsutil = [sys.executable, options.gsutil_py_path]
@@ skipping 398 matching lines @@
                            help='Specify path to gsutil.py script.')
   option_parser.add_option('--ninja-path', default='ninja',
                            help='Specify path to the ninja tool.')
   option_parser.add_option('--ninja-ensure-up-to-date', action='store_true',
                            help='Checks the output of the ninja builder to '
                                 'confirm that a second compile immediately '
                                 'the first is a no-op.')
   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:
     options.src_dir = 'src'
   options.src_dir = os.path.abspath(options.src_dir)
 
   options.target_output_dir = get_target_build_dir(options)
 
   assert options.build_tool in (None, 'ninja')
   return options, args
@@ skipping 18 matching lines @@
   exit_status = main_ninja(options, args, env)
 
   # stop goma
   goma_teardown(options, env, exit_status, goma_cloudtail)
 
   return exit_status
 
 
 if '__main__' == __name__:
   sys.exit(real_main())