Reland 'Add buildbot metadata to compiler_proxy log'

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 83 matching lines @@
                              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]
-  goma_utils.UploadGomaCompilerProxyInfo(override_gsutil=override_gsutil)
+    # Needs to add '--', otherwise gsutil options will be passed to gsutil.py.
+    override_gsutil = [sys.executable, options.gsutil_py_path, '--']
+  goma_utils.UploadGomaCompilerProxyInfo(override_gsutil=override_gsutil,
+                                         builder=options.buildbot_buildername,
+                                         master=options.buildbot_mastername,
+                                         slave=options.buildbot_slavename,
+                                         clobber=options.buildbot_clobber)
 
   # Upload GomaStats to make it monitored.
   if env.get('GOMA_DUMP_STATS_FILE'):
     goma_utils.SendGomaStats(env['GOMA_DUMP_STATS_FILE'],
                              env.get('GOMACTL_CRASH_REPORT_ID_FILE'),
                              options.build_data_dir)
 
 # TODO(tikuta): move to goma_utils.py
 def goma_setup(options, env):
   """Sets up goma if necessary.
@@ skipping 308 matching lines @@
         print 'Failing build because ninja reported work to do.'
         print 'This means that after completing a compile, another was run and'
         print 'it resulted in still having work to do (that is, a no-op build'
         print 'wasn\'t a no-op). Consult the first "ninja explain:" line for a'
         print 'likely culprit.'
         return 1
     return exit_status
   finally:
     override_gsutil = None
     if options.gsutil_py_path:
-      override_gsutil = [sys.executable, options.gsutil_py_path]
+      # Needs to add '--', otherwise gsutil options will be passed to gsutil.py.
+      override_gsutil = [sys.executable, options.gsutil_py_path, '--']
 
     goma_utils.UploadNinjaLog(
         options.target_output_dir, options.compiler, command, exit_status,
         override_gsutil=override_gsutil)
 
 
 def get_target_build_dir(options):
   """Keep this function in sync with src/build/landmines.py"""
   if chromium_utils.IsLinux() and options.cros_board:
     # When building ChromeOS's Simple Chrome workflow, the output directory
@@ skipping 48 matching lines @@
   option_parser.add_option('--goma-fail-fast', action='store_true')
   option_parser.add_option('--goma-disable-local-fallback', action='store_true')
   option_parser.add_option('--goma-jsonstatus',
                            help='Specify a file to dump goma_ctl jsonstatus.')
   option_parser.add_option('--goma-service-account-json-file',
                            help='Specify a file containing goma service account'
                                 ' credentials')
   option_parser.add_option('--goma-jobs', default=None,
                            help='The number of jobs for ninja -j.')
   option_parser.add_option('--gsutil-py-path',
-                           help='Specify path to gsutil.py script.')
+                           help='Specify path to gsutil.py script '
+                                'in depot_tools.')
   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.
@@ skipping 36 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())