Re-organize Skia recipes

infra/bots/recipes/swarm_test.py

Index: infra/bots/recipes/swarm_test.py
diff --git a/infra/bots/recipes/swarm_test.py b/infra/bots/recipes/swarm_test.py
index a56da1ea5d1d8734820a32f9837374d08e5755a7..1d5cb4d50d593b43419ff8fc2c5dbcad87e68932 100644
--- a/infra/bots/recipes/swarm_test.py
+++ b/infra/bots/recipes/swarm_test.py
@@ -13,6 +13,7 @@ DEPS = [
   'recipe_engine/properties',
   'recipe_engine/raw_io',
   'skia',
+  'run',
 ]
 
 
@@ -36,7 +37,7 @@ def RunSteps(api):
   api.skia.setup()
   api.skia.test_steps()
   api.skia.cleanup_steps()
-  api.skia.check_failure()
+  api.run.check_failure()
 
 
 def GenTests(api):
@@ -307,38 +308,3 @@ def GenTests(api):
     ) +
     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')
-    )
-  )