Re-organize Skia recipes

infra/bots/recipes/swarm_test.py

 # Copyright 2016 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 module for Skia Swarming test.
 
 
 DEPS = [
+  'core',
   'recipe_engine/json',
   'recipe_engine/path',
   'recipe_engine/platform',
   'recipe_engine/properties',
   'recipe_engine/raw_io',
-  'skia',
+  'run',
 ]
 
 
 TEST_BUILDERS = {
   'client.skia': {
     'skiabot-linux-swarm-000': [
       'Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug',
       'Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug',
       'Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug',
       'Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot',
       'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug',
       'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN',
       'Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind',
       'Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot',
     ],
   },
 }
 
 
 def RunSteps(api):
-  api.skia.setup()
-  api.skia.test_steps()
-  api.skia.cleanup_steps()
-  api.skia.check_failure()
+  api.core.setup()
+  api.core.test_steps()
+  api.core.cleanup_steps()
+  api.run.check_failure()
 
 
 def GenTests(api):
   def AndroidTestData(builder, adb=None):
     test_data = (
         api.step_data(
             'get EXTERNAL_STORAGE dir',
             stdout=api.raw_io.output('/storage/emulated/legacy')) +
         api.step_data(
             'read SKP_VERSION',
@@ skipping 250 matching lines @@
     api.path.exists(
         api.path['slave_build'].join('skia'),
         api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
                                      'skimage', 'VERSION'),
         api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
                                      'skp', 'VERSION'),
         api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
     ) +
     api.platform('win', 64)
   )
-
-  builder = 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug'
-  yield (
-    api.test('legacy_skimage_version') +
-    api.properties(buildername=builder,
-                   mastername='client.skia',
-                   slavename='skiabot-linux-swarm-000',
-                   buildnumber=6,
-                   revision='abc123',
-                   path_config='kitchen',
-                   swarm_out_dir='[SWARM_OUT_DIR]') +
-    api.path.exists(
-        api.path['slave_build'].join('skia'),
-        api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
-                                     'skp', 'VERSION'),
-        api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
-    )
-  )
-
-  yield (
-    api.test('legacy_skp_version') +
-    api.properties(buildername=builder,
-                   mastername='client.skia',
-                   slavename='skiabot-linux-swarm-000',
-                   buildnumber=6,
-                   revision='abc123',
-                   path_config='kitchen',
-                   swarm_out_dir='[SWARM_OUT_DIR]') +
-    api.path.exists(
-        api.path['slave_build'].join('skia'),
-        api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
-                                     'skimage', 'VERSION'),
-        api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
-    )
-  )