Move builder_spec, [dm|nanobench]_flags, builder_name_schema to recipes

infra/bots/recipes/swarm_trigger.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 trigger.
 
 
 import json
 
 
 DEPS = [
-  'core',
   'build/file',
   'build/gsutil',
+  'builder_name_schema',
+  'core',
   'depot_tools/depot_tools',
   'depot_tools/git',
   'depot_tools/tryserver',
   'recipe_engine/json',
   'recipe_engine/path',
   'recipe_engine/properties',
   'recipe_engine/python',
   'recipe_engine/raw_io',
   'recipe_engine/step',
   'recipe_engine/time',
@@ skipping 26 matching lines @@
       'Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release',
       'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug',
       'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN',
       'Test-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Release',
       'Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release',
     ],
   },
 }
 
 
-def derive_compile_bot_name(builder_name, builder_spec):
-  builder_cfg = builder_spec['builder_cfg']
+def derive_compile_bot_name(api):
+  builder_name = api.properties['buildername']
+  builder_cfg = api.builder_name_schema.DictForBuilderName(builder_name)
   if builder_cfg['role'] == 'Housekeeper':
     return 'Build-Ubuntu-GCC-x86_64-Release-Shared'
   if builder_cfg['role'] in ('Test', 'Perf'):
     os = builder_cfg['os']
     extra_config = builder_cfg.get('extra_config')
     if os == 'Android':
       if extra_config == 'Vulkan':
         extra_config = '%s_%s' % (os, 'Vulkan')
       else:
         extra_config = os
       os = 'Ubuntu'
     elif os == 'iOS':
       extra_config = os
       os = 'Mac'
     elif 'Win' in os:
       os = 'Win'
-    builder_name = 'Build-%s-%s-%s-%s' % (
-      os,
-      builder_cfg['compiler'],
-      builder_cfg['arch'],
-      builder_cfg['configuration']
-    )
-    if extra_config:
-      builder_name += '-%s' % extra_config
-    if builder_cfg['is_trybot']:
-      builder_name += '-Trybot'
+    return api.builder_name_schema.MakeBuilderName(
+        role=api.builder_name_schema.BUILDER_ROLE_BUILD,
+        os=os,
+        compiler=builder_cfg['compiler'],
+        target_arch=builder_cfg['arch'],
+        configuration=builder_cfg['configuration'],
+        extra_config=extra_config,
+        is_trybot=api.builder_name_schema.IsTrybot(builder_name))
   return builder_name
 
 
 def swarm_dimensions(builder_spec):
   """Return a dict of keys and values to be used as Swarming bot dimensions."""
   dimensions = {
     'pool': 'Skia',
   }
   builder_cfg = builder_spec['builder_cfg']
   dimensions['os'] = builder_cfg.get('os', 'Ubuntu')
@@ skipping 173 matching lines @@
       store_output=False,
       extra_isolate_hashes=extra_isolate_hashes)
   return api.swarming.collect_swarming_task(task)
 
 
 def infra_swarm(api, got_revision, infrabots_dir, extra_isolate_hashes):
   # Fake the builder spec.
   builder_spec = {
     'builder_cfg': {
       'role': 'Infra',
-      'is_trybot': api.properties['buildername'].endswith('-Trybot'),
+      'is_trybot': api.builder_name_schema.IsTrybot(
+          api.properties['buildername'])
     }
   }
   task = trigger_task(
       api,
       'infra',
       api.properties['buildername'],
       api.properties['mastername'],
       api.properties['slavename'],
       api.properties['buildnumber'],
       builder_spec,
       got_revision,
       infrabots_dir,
       idempotent=False,
       store_output=False,
       extra_isolate_hashes=extra_isolate_hashes)
   return api.swarming.collect_swarming_task(task)
 
 
 def compile_steps_swarm(api, builder_spec, got_revision, infrabots_dir,
                         extra_isolate_hashes, cipd_packages):
-  builder_name = derive_compile_bot_name(api.properties['buildername'],
-                                         builder_spec)
+  builder_name = derive_compile_bot_name(api)
   compile_builder_spec = builder_spec
   if builder_name != api.properties['buildername']:
-    compile_builder_spec = api.core.get_builder_spec(
-        api.path['slave_build'].join('skia'), builder_name)
+    compile_builder_spec = api.vars.get_builder_spec(builder_name)
 
   extra_hashes = extra_isolate_hashes[:]
 
   # Windows bots require a toolchain.
   if 'Win' in builder_name:
     version_file = infrabots_dir.join('assets', 'win_toolchain', 'VERSION')
     version = api.run.readfile(version_file,
-                                 name='read win_toolchain VERSION',
-                                 test_data='0').rstrip()
+                               name='read win_toolchain VERSION',
+                               test_data='0').rstrip()
     version = 'version:%s' % version
     pkg = ('t', 'skia/bots/win_toolchain', version)
     cipd_packages.append(pkg)
 
     if 'Vulkan' in builder_name:
       cipd_packages.append(cipd_pkg(api, infrabots_dir, 'win_vulkan_sdk'))
 
   # Fake these properties for compile tasks so that they can be de-duped.
   master = 'client.skia.compile'
   slave = 'skiabot-dummy-compile-slave'
@@ skipping 267 matching lines @@
   extra_hashes = []
 
   # Get ready to compile.
   compile_cipd_deps = []
   extra_compile_hashes = []
 
   infrabots_dir = api.path['checkout'].join('infra', 'bots')
   if 'Infra' in api.properties['buildername']:
     return infra_swarm(api, got_revision, infrabots_dir, extra_hashes)
 
-  builder_spec = api.core.get_builder_spec(api.path['checkout'],
-                                           api.properties['buildername'])
+  builder_spec = api.vars.get_builder_spec(api.properties['buildername'])
   builder_cfg = builder_spec['builder_cfg']
 
   if 'RecreateSKPs' in api.properties['buildername']:
     recreate_skps_swarm(api, builder_spec, got_revision, infrabots_dir,
                         extra_hashes)
     return
   if 'Android' in api.properties['buildername']:
     compile_cipd_deps.append(cipd_pkg(api, infrabots_dir, 'android_sdk'))
 
   # Compile.
@@ skipping 89 matching lines @@
   test += api.path.exists(*paths)
 
   return test
 
 
 def GenTests(api):
   for mastername, slaves in TEST_BUILDERS.iteritems():
     for slavename, builders_by_slave in slaves.iteritems():
       for builder in builders_by_slave:
         yield test_for_bot(api, builder, mastername, slavename)