[recipes] Separate build and test flavors

Bug: skia:6473
Change-Id: If1d6e1f64ec53624e7b540abd9d8a61cc82c4e0a
Reviewed-on: https://skia-review.googlesource.com/125947
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Eric Boren <borenet@google.com>

3 files changed, 8 insertions, 25 deletions

diff --git a/infra/bots/recipes/check_generated_files.py b/infra/bots/recipes/check_generated_files.py
index c32477b108..b0c72f2ed6 100644
--- a/infra/bots/recipes/check_generated_files.py
+++ b/infra/bots/recipes/check_generated_files.py
@@ -6,6 +6,7 @@
 # Recipe for the Skia PerCommit Housekeeper.
 
 DEPS = [
+  'build',
   'recipe_engine/context',
   'recipe_engine/file',
   'recipe_engine/path',
@@ -54,7 +55,7 @@ for r, d, files in os.walk('%s'):
 """ % cwd)
 
     # Regenerate the SKSL files.
-    api.flavor.compile('compile_processors')
+    api.build()
 
     # Get a second diff. If this doesn't match the first, then there have been
     # modifications to the generated files.
diff --git a/infra/bots/recipes/compile.py b/infra/bots/recipes/compile.py
index 2af1601d60..b05f97134f 100644
--- a/infra/bots/recipes/compile.py
+++ b/infra/bots/recipes/compile.py
@@ -7,6 +7,7 @@
 
 
 DEPS = [
+  'build',
   'core',
   'recipe_engine/context',
   'recipe_engine/file',
@@ -16,17 +17,11 @@ DEPS = [
   'recipe_engine/properties',
   'recipe_engine/python',
   'recipe_engine/step',
-  'flavor',
   'run',
   'vars',
 ]
 
 
-def build_targets_from_builder_dict(builder_dict):
-  """Return a list of targets to build, depending on the builder type."""
-  return ['most']
-
-
 def RunSteps(api):
   api.vars.setup()
 
@@ -36,18 +31,12 @@ def RunSteps(api):
   else:
     api.core.checkout_bot_update()
   api.file.ensure_directory('makedirs tmp_dir', api.vars.tmp_dir)
-  api.flavor.setup()
-
-  build_targets = build_targets_from_builder_dict(api.vars.builder_cfg)
 
   try:
-    for target in build_targets:
-      api.flavor.compile(target)
-    api.run.copy_build_products(
-        api.flavor.out_dir,
+    api.build()
+    api.build.copy_build_products(
         api.vars.swarming_out_dir.join(
             'out', api.vars.configuration))
-    api.flavor.copy_extra_build_products(api.vars.swarming_out_dir)
   finally:
     if 'Win' in api.vars.builder_cfg.get('os', ''):
       api.python.inline(
@@ -62,7 +51,6 @@ for p in psutil.process_iter():
 ''',
           infra_step=True)
 
-  api.flavor.cleanup_steps()
   api.run.check_failure()
 
 
diff --git a/infra/bots/recipes/ct_skps.py b/infra/bots/recipes/ct_skps.py
index 43b8346d10..ae70e7fc72 100644
--- a/infra/bots/recipes/ct_skps.py
+++ b/infra/bots/recipes/ct_skps.py
@@ -7,9 +7,9 @@ import math
 
 
 DEPS = [
+  'build',
   'core',
   'ct',
-  'flavor',
   'recipe_engine/context',
   'recipe_engine/file',
   'recipe_engine/json',
@@ -68,13 +68,10 @@ def RunSteps(api):
   # Figure out which tool to use.
   if 'DM' in buildername:
     skia_tool = 'dm'
-    build_target = 'dm'
   elif 'BENCH' in buildername:
     skia_tool = 'nanobench'
-    build_target = 'nanobench'
   elif 'IMG_DECODE' in buildername:
     skia_tool = 'get_images_from_skps'
-    build_target = 'tools'
   else:
     raise Exception('Do not recognise the buildername %s.' % buildername)
 
@@ -84,18 +81,15 @@ def RunSteps(api):
   api.vars.setup()
   api.core.checkout_bot_update()
   api.file.ensure_directory('makedirs tmp_dir', api.vars.tmp_dir)
-  api.flavor.setup()
 
-  api.flavor.compile(build_target)
+  api.build()
 
   # Required paths.
   infrabots_dir = api.vars.skia_dir.join('infra', 'bots')
   isolate_dir = infrabots_dir.join('ct')
   isolate_path = isolate_dir.join(CT_SKPS_ISOLATE)
 
-  api.run.copy_build_products(
-      api.flavor.out_dir,
-      isolate_dir)
+  api.build.copy_build_products(isolate_dir)
   api.skia_swarming.setup(
       infrabots_dir.join('tools', 'luci-go'),
       swarming_rev='')