compile.py: explicitly pass gsutil.py path for uploading goma logs

scripts/slave/slave_utils.py

 # 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.
 
 """Functions specific to build slaves, shared by several buildbot scripts.
 """
 
 import datetime
 import glob
 import os
@@ skipping 357 matching lines @@
   ):
     return name
 
   # Add provider prefix
   if not provider_prefix:
     provider_prefix = 'x-goog-meta'
   return '%s-%s' % (provider_prefix, name)
 
 
 def GSUtilCopy(source, dest, mimetype=None, gs_acl=None, cache_control=None,
-               metadata=None):
+               metadata=None, override_gsutil=None):
   """Copy a file to Google Storage.
 
   Runs the following command:
     gsutil -h Content-Type:<mimetype> \
            -h Cache-Control:<cache_control> \
         cp -a <gs_acl> file://<filename> <gs_base>/<subdir>/<filename w/o path>
 
   Args:
     source: the source URI
     dest: the destination URI
     mimetype: optional value to add as a Content-Type header
     gs_acl: optional value to add as a canned-acl
     cache_control: optional value to set Cache-Control header
     metadata: (dict) A dictionary of string key/value metadata entries to set
         (see `gsutil cp' '-h' option)
+    override_gsutil (list): optional argv to run gsutil
   Returns:
     The status code returned from running the generated gsutil command.
   """
 
   if not source.startswith('gs://') and not source.startswith('file://'):
     source = 'file://' + source
   if not dest.startswith('gs://') and not dest.startswith('file://'):
     dest = 'file://' + dest
+  # The setup also sets up some env variables - for now always run that.
   gsutil = GSUtilSetup()
   # Run the gsutil command. gsutil internally calls command_wrapper, which
   # will try to run the command 10 times if it fails.
-  command = [gsutil]
+  command = override_gsutil or [gsutil]
 
   if not metadata:
     metadata = {}
   if mimetype:
     metadata['Content-Type'] = mimetype
   if cache_control:
     metadata['Cache-Control'] = cache_control
   for k, v in sorted(metadata.iteritems(), key=lambda (k, _): k):
     field = GSUtilGetMetadataField(k)
     param = (field) if v is None else ('%s:%s' % (field, v))
@@ skipping 310 matching lines @@
     '--filesync',
     '--recurse-paths',
     '--symlinks',
     local_archive,
   ]
   zip_cmd.extend(targets)
 
   chromium_utils.RunCommand(zip_cmd)
   GSUtilCopy(local_archive, 'gs://%s/%s' % (bucket, archive))
   return 'https://storage.cloud.google.com/%s/%s' % (bucket, archive)