Re-organize Skia recipes

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',
+  'core',
   'depot_tools/gclient',
   'recipe_engine/path',
   'recipe_engine/properties',
   'recipe_engine/python',
   'recipe_engine/raw_io',
   'recipe_engine/step',
-  'skia',
+  'vars',
 ]
 
 
 TEST_BUILDERS = {
   'client.skia.compile': {
     'skiabot-linux-swarm-000': [
       'Housekeeper-Nightly-RecreateSKPs_Canary',
       'Housekeeper-Weekly-RecreateSKPs',
     ],
   },
@@ skipping 56 matching lines @@
 backup_file = os.path.join(home, TOKEN_FILE_BACKUP)
 if os.path.isfile(backup_file):
   os.rename(backup_file, token_file)
         """ % (DEPOT_TOOLS_AUTH_TOKEN_FILE,
                DEPOT_TOOLS_AUTH_TOKEN_FILE_BACKUP),
     )
 
 
 def RunSteps(api):
   # Check out Chrome.
-  api.skia.setup()
+  api.core.setup()
 
-  src_dir = api.skia.checkout_root.join('src')
+  src_dir = api.vars.checkout_root.join('src')
   out_dir = src_dir.join('out', 'Release')
 
   # Call GN.
   platform = 'linux64'  # This bot only runs on linux; don't bother checking.
   gn = src_dir.join('buildtools', platform, 'gn')
   api.step('GN',
            [gn, 'gen', out_dir],
            env={'CPPFLAGS': '-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1',
                 'GYP_GENERATORS': 'ninja'},
            cwd=src_dir)
@@ skipping 36 matching lines @@
       '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.skia.infrabots_dir.join('assets', 'skp')
+  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.skia.skia_dir,
+           cwd=api.vars.skia_dir,
            env=recreate_skps_env)
 
   # Upload the SKPs.
   if 'Canary' not in api.properties['buildername']:
     cmd = ['python',
-           api.skia.skia_dir.join('infra', 'bots', 'upload_skps.py'),
+           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.skia.skia_dir,
+               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