RecreateSKPs: Don't download and use the .boto file

infra/bots/recipes/swarm_RecreateSKPs.py

 # Copyright 2014 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.
 
 
 """Recipe for the Skia RecreateSKPs Bot."""
 
 
 DEPS = [
   'build/file',
@@ skipping 92 matching lines @@
   api.step('GN',
            [gn, 'gen', out_dir],
            env={'CPPFLAGS': '-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1',
                 'GYP_GENERATORS': 'ninja'},
            cwd=src_dir)
   # Build Chrome.
   api.step('Build Chrome',
            ['ninja', '-C', out_dir, 'chrome'],
            cwd=src_dir)
 
-  # Download boto file (needed by recreate_skps.py) to tmp dir.
-  boto_file = api.path['slave_build'].join('tmp', '.boto')
-  api.python.inline(
-      'download boto file',
-      """
-import os
-import urllib2
-
-BOTO_URL = 'http://metadata/computeMetadata/v1/project/attributes/boto-file'
-
-dest_path = '%s'
-dest_dir = os.path.dirname(dest_path)
-if not os.path.exists(dest_dir):
-  os.makedirs(dest_dir)
-
-req = urllib2.Request(BOTO_URL, headers={'Metadata-Flavor': 'Google'})
-contents = urllib2.urlopen(req).read()
-
-with open(dest_path, 'w') as f:
-  f.write(contents)
-        """ % boto_file)
-
   # Clean up the output dir.
   output_dir = api.path['slave_build'].join('skp_output')
   if api.path.exists(output_dir):
     api.file.rmtree('skp_output', output_dir)
   api.file.makedirs('skp_output', output_dir)
 
   # Capture the SKPs.
   path_var= api.path.pathsep.join([str(api.path['depot_tools']), '%(PATH)s'])
   env = {
       'CHROME_HEADLESS': '1',
       'PATH': path_var,
   }
-  boto_env = {
-      'AWS_CREDENTIAL_FILE': boto_file,
-      'BOTO_CONFIG': boto_file,
-  }
-  recreate_skps_env = {}
-  recreate_skps_env.update(env)
-  recreate_skps_env.update(boto_env)
   asset_dir = api.vars.infrabots_dir.join('assets', 'skp')
   cmd = ['python', asset_dir.join('create.py'),
          '--chrome_src_path', src_dir,
          '--browser_executable', src_dir.join('out', 'Release', 'chrome'),
          '--target_dir', output_dir]
   if 'Canary' not in api.properties['buildername']:
     cmd.append('--upload_to_partner_bucket')
   api.step('Recreate SKPs',
            cmd=cmd,
            cwd=api.vars.skia_dir,
-           env=recreate_skps_env)
+           env=env)
 
   # Upload the SKPs.
   if 'Canary' not in api.properties['buildername']:
     cmd = ['python',
            api.vars.skia_dir.join('infra', 'bots', 'upload_skps.py'),
            '--target_dir', output_dir]
     with depot_tools_auth(api, UPDATE_SKPS_KEY):
       api.step('Upload SKPs',
                cmd=cmd,
                cwd=api.vars.skia_dir,
                env=env)
 
 
 def GenTests(api):
   for mastername, slaves in TEST_BUILDERS.iteritems():
     for slavename, builders_by_slave in slaves.iteritems():
       for builder in builders_by_slave:
         test = (
             api.test(builder) +
             api.properties(buildername=builder,
                            mastername=mastername,
                            slavename=slavename,
                            revision='abc123',
                            buildnumber=2,
                            path_config='kitchen',
                            swarm_out_dir='[SWARM_OUT_DIR]') +
             api.path.exists(api.path['slave_build'].join('skp_output'))
         )
         yield test