libyuv: refactor recipes

scripts/slave/recipe_modules/libyuv/builders.py

-# Copyright 2014 The Chromium Authors. All rights reserved.
+# 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 for building and running tests for Libyuv stand-alone.
-"""
+# Contains the bulk of the libyuv builder configurations to improve readability
+# of the recipe.
 
 from recipe_engine.types import freeze
 
-DEPS = [
-  'depot_tools/bot_update',
-  'chromium',
-  'depot_tools/gclient',
-  'libyuv',
-  'recipe_engine/path',
-  'recipe_engine/platform',
-  'recipe_engine/properties',
-  'recipe_engine/step',
-  'depot_tools/tryserver',
-]
-
 RECIPE_CONFIGS = freeze({
   'libyuv': {
     'chromium_config': 'libyuv',
     'gclient_config': 'libyuv',
   },
   'libyuv_clang': {
     'chromium_config': 'libyuv_clang',
     'gclient_config': 'libyuv',
   },
   'libyuv_gcc': {
@@ skipping 17 matching lines @@
 BUILDERS = freeze({
   'client.libyuv': {
     'builders': {
       'Win32 Debug (VS2010)': {
         'recipe_config': 'libyuv',
         'chromium_apply_config': ['msvs2010'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_BITS': 32,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'win'},
       },
       'Win32 Release (VS2010)': {
         'recipe_config': 'libyuv',
         'chromium_apply_config': ['msvs2010'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 32,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'win'},
       },
       'Win64 Debug (VS2010)': {
         'recipe_config': 'libyuv',
         'chromium_apply_config': ['msvs2010'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'win'},
       },
       'Win64 Release (VS2010)': {
         'recipe_config': 'libyuv',
         'chromium_apply_config': ['msvs2010'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'win'},
       },
       'Win32 Debug (VS2012)': {
         'recipe_config': 'libyuv',
         'chromium_apply_config': ['msvs2012'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_BITS': 32,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'win'},
       },
       'Win32 Release (VS2012)': {
         'recipe_config': 'libyuv',
         'chromium_apply_config': ['msvs2012'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 32,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'win'},
       },
       'Win64 Debug (VS2012)': {
         'recipe_config': 'libyuv',
         'chromium_apply_config': ['msvs2012'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'win'},
       },
       'Win64 Release (VS2012)': {
         'recipe_config': 'libyuv',
         'chromium_apply_config': ['msvs2012'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'win'},
       },
       'Win32 Debug (VS2013)': {
         'recipe_config': 'libyuv',
         'chromium_apply_config': ['msvs2013'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_BITS': 32,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'win'},
       },
       'Win32 Release (VS2013)': {
         'recipe_config': 'libyuv',
         'chromium_apply_config': ['msvs2013'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 32,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'win'},
       },
       'Win64 Debug (VS2013)': {
         'recipe_config': 'libyuv',
         'chromium_apply_config': ['msvs2013'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'win'},
       },
       'Win64 Release (VS2013)': {
         'recipe_config': 'libyuv',
         'chromium_apply_config': ['msvs2013'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'win'},
       },
       'Win32 Debug (Clang)': {
         'recipe_config': 'libyuv_clang',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_BITS': 32,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'win'},
       },
       'Win32 Release (Clang)': {
         'recipe_config': 'libyuv_clang',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 32,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'win'},
       },
       'Win64 Debug (Clang)': {
         'recipe_config': 'libyuv_clang',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'win'},
       },
       'Win64 Release (Clang)': {
         'recipe_config': 'libyuv_clang',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'win'},
       },
       'Win64 Debug (GN)': {
         'recipe_config': 'libyuv_clang',
         'chromium_apply_config': ['gn'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder',
         'testing': {'platform': 'win'},
       },
       'Win64 Release (GN)': {
         'recipe_config': 'libyuv_clang',
         'chromium_apply_config': ['gn'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder',
         'testing': {'platform': 'win'},
       },
       'Mac64 Debug': {
         'recipe_config': 'libyuv',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'mac'},
       },
       'Mac64 Release': {
         'recipe_config': 'libyuv',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'mac'},
       },
       'Mac64 Debug (GN)': {
         'recipe_config': 'libyuv',
         'chromium_apply_config': ['gn'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder',
         'testing': {'platform': 'mac'},
       },
       'Mac64 Release (GN)': {
         'recipe_config': 'libyuv',
         'chromium_apply_config': ['gn'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder',
         'testing': {'platform': 'mac'},
       },
       'Mac Asan': {
         'recipe_config': 'libyuv_clang',
         'chromium_apply_config': ['asan'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'mac'},
       },
       'iOS Debug': {
         'recipe_config': 'libyuv_ios',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_BITS': 32,
           'TARGET_ARCH': 'arm',
           'TARGET_PLATFORM': 'ios',
         },
+        'bot_type': 'builder',
         'testing': {'platform': 'mac'},
       },
       'iOS Release': {
         'recipe_config': 'libyuv_ios',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 32,
           'TARGET_ARCH': 'arm',
           'TARGET_PLATFORM': 'ios',
         },
+        'bot_type': 'builder',
         'testing': {'platform': 'mac'},
       },
       'iOS ARM64 Debug': {
         'recipe_config': 'libyuv_ios',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_BITS': 64,
           'TARGET_ARCH': 'arm',
           'TARGET_PLATFORM': 'ios',
         },
+        'bot_type': 'builder',
         'testing': {'platform': 'mac'},
       },
       'iOS ARM64 Release': {
         'recipe_config': 'libyuv_ios',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 64,
           'TARGET_ARCH': 'arm',
           'TARGET_PLATFORM': 'ios',
         },
+        'bot_type': 'builder',
         'testing': {'platform': 'mac'},
       },
       'Linux32 Debug': {
         'recipe_config': 'libyuv',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_BITS': 32,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'linux'},
       },
       'Linux32 Release': {
         'recipe_config': 'libyuv',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 32,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'linux'},
       },
       'Linux64 Debug': {
         'recipe_config': 'libyuv',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'linux'},
       },
       'Linux64 Release': {
         'recipe_config': 'libyuv',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'linux'},
       },
       'Linux64 Debug (GN)': {
         'recipe_config': 'libyuv',
         'chromium_apply_config': ['gn'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder',
         'testing': {'platform': 'linux'},
       },
       'Linux64 Release (GN)': {
         'recipe_config': 'libyuv',
         'chromium_apply_config': ['gn'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder',
         'testing': {'platform': 'linux'},
       },
       'Linux GCC': {
         'recipe_config': 'libyuv_gcc',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'linux'},
       },
       'Linux Asan': {
         'recipe_config': 'libyuv_clang',
         'chromium_apply_config': ['asan', 'lsan'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'linux'},
       },
       'Linux Memcheck': {
         'recipe_config': 'libyuv',
         'chromium_apply_config': ['memcheck'],
         'gclient_apply_config': ['libyuv_valgrind'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'linux'},
       },
       'Linux MSan': {
         'recipe_config': 'libyuv_clang',
         'chromium_apply_config': ['msan', 'msan_full_origin_tracking',
                                   'prebuilt_instrumented_libraries'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'linux'},
       },
       'Linux Tsan v2': {
         'recipe_config': 'libyuv_clang',
         'chromium_apply_config': ['tsan2'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'linux'},
       },
       'Linux UBSan': {
         'recipe_config': 'libyuv_clang',
         'chromium_apply_config': ['ubsan'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'linux'},
       },
       'Linux UBSan vptr': {
         'recipe_config': 'libyuv_clang',
         'chromium_apply_config': ['ubsan_vptr'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'linux'},
       },
       'Android Debug': {
         'recipe_config': 'libyuv_android',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'arm',
           'TARGET_BITS': 32,
         },
+        'bot_type': 'builder',
         'testing': {'platform': 'linux'},
       },
       'Android Release': {
         'recipe_config': 'libyuv_android',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'arm',
           'TARGET_BITS': 32,
         },
+        'bot_type': 'builder',
         'testing': {'platform': 'linux'},
       },
       'Android ARM64 Debug': {
         'recipe_config': 'libyuv_android',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'arm',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder',
         'testing': {'platform': 'linux'},
       },
       'Android Clang Debug': {
         'recipe_config': 'libyuv_android_clang',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'arm',
           'TARGET_BITS': 32,
         },
+        'bot_type': 'builder',
         'testing': {'platform': 'linux'},
       },
       'Android32 x86 Debug': {
         'recipe_config': 'libyuv_android',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'intel',
           'TARGET_BITS': 32,
         },
@@ skipping 24 matching lines @@
       },
       'Android Debug (GN)': {
         'recipe_config': 'libyuv_android',
         'chromium_apply_config': ['gn'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'arm',
           'TARGET_BITS': 32,
         },
+        'bot_type': 'builder',
         'testing': {'platform': 'linux'},
       },
       'Android Release (GN)': {
         'recipe_config': 'libyuv_android',
         'chromium_apply_config': ['gn'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'arm',
           'TARGET_BITS': 32,
         },
+        'bot_type': 'builder',
         'testing': {'platform': 'linux'},
       },
     },
   },
   'tryserver.libyuv': {
     'builders': {
       'win': {
         'recipe_config': 'libyuv',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_BITS': 32,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'win'},
       },
       'win_rel': {
         'recipe_config': 'libyuv',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 32,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'win'},
       },
       'win_x64_rel': {
         'recipe_config': 'libyuv',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'win'},
       },
       'win_clang': {
         'recipe_config': 'libyuv_clang',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_BITS': 32,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'win'},
       },
       'win_clang_rel': {
         'recipe_config': 'libyuv_clang',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 32,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'win'},
       },
       'win_x64_clang_rel': {
         'recipe_config': 'libyuv_clang',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'win'},
       },
       'win_x64_gn': {
         'recipe_config': 'libyuv_clang',
         'chromium_apply_config': ['gn'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder',
         'testing': {'platform': 'win'},
       },
       'win_x64_gn_rel': {
         'recipe_config': 'libyuv_clang',
         'chromium_apply_config': ['gn'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder',
         'testing': {'platform': 'win'},
       },
       'mac': {
         'recipe_config': 'libyuv',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'mac'},
       },
       'mac_rel': {
         'recipe_config': 'libyuv',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'mac'},
       },
       'mac_gn': {
         'recipe_config': 'libyuv',
         'chromium_apply_config': ['gn'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder',
         'testing': {'platform': 'mac'},
       },
       'mac_gn_rel': {
         'recipe_config': 'libyuv',
         'chromium_apply_config': ['gn'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder',
         'testing': {'platform': 'mac'},
       },
       'mac_asan': {
         'recipe_config': 'libyuv_clang',
         'chromium_apply_config': ['asan'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'mac'},
       },
       'ios': {
         'recipe_config': 'libyuv_ios',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_BITS': 32,
           'TARGET_ARCH': 'arm',
           'TARGET_PLATFORM': 'ios',
         },
+        'bot_type': 'builder',
         'testing': {'platform': 'mac'},
       },
       'ios_rel': {
         'recipe_config': 'libyuv_ios',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 32,
           'TARGET_ARCH': 'arm',
           'TARGET_PLATFORM': 'ios',
         },
+        'bot_type': 'builder',
         'testing': {'platform': 'mac'},
       },
       'ios_arm64': {
         'recipe_config': 'libyuv_ios',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_BITS': 64,
           'TARGET_ARCH': 'arm',
           'TARGET_PLATFORM': 'ios',
         },
+        'bot_type': 'builder',
         'testing': {'platform': 'mac'},
       },
       'ios_arm64_rel': {
         'recipe_config': 'libyuv_ios',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 64,
           'TARGET_ARCH': 'arm',
           'TARGET_PLATFORM': 'ios',
         },
+        'bot_type': 'builder',
         'testing': {'platform': 'mac'},
       },
       'linux': {
         'recipe_config': 'libyuv',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'linux'},
       },
       'linux_rel': {
         'recipe_config': 'libyuv',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'linux'},
       },
       'linux_gn': {
         'recipe_config': 'libyuv',
         'chromium_apply_config': ['gn'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder',
         'testing': {'platform': 'linux'},
       },
       'linux_gn_rel': {
         'recipe_config': 'libyuv',
         'chromium_apply_config': ['gn'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder',
         'testing': {'platform': 'linux'},
       },
       'linux_gcc': {
         'recipe_config': 'libyuv_gcc',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'linux'},
       },
       'linux_asan': {
         'recipe_config': 'libyuv_clang',
         'chromium_apply_config': ['asan', 'lsan'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'linux'},
       },
       'linux_memcheck': {
         'recipe_config': 'libyuv',
         'chromium_apply_config': ['memcheck'],
         'gclient_apply_config': ['libyuv_valgrind'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'linux'},
       },
       'linux_msan': {
         'recipe_config': 'libyuv_clang',
         'chromium_apply_config': ['msan', 'msan_full_origin_tracking',
                                   'prebuilt_instrumented_libraries'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'linux'},
       },
       'linux_tsan2': {
         'recipe_config': 'libyuv_clang',
         'chromium_apply_config': ['tsan2'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'linux'},
       },
       'linux_ubsan': {
         'recipe_config': 'libyuv_clang',
         'chromium_apply_config': ['ubsan'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'linux'},
       },
       'linux_ubsan_vptr': {
         'recipe_config': 'libyuv_clang',
         'chromium_apply_config': ['ubsan_vptr'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder_tester',
         'testing': {'platform': 'linux'},
       },
       'android': {
         'recipe_config': 'libyuv_android',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'arm',
           'TARGET_BITS': 32,
         },
+        'bot_type': 'builder',
         'testing': {'platform': 'linux'},
       },
       'android_rel': {
         'recipe_config': 'libyuv_android',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'arm',
           'TARGET_BITS': 32,
         },
+        'bot_type': 'builder',
         'testing': {'platform': 'linux'},
       },
       'android_clang': {
         'recipe_config': 'libyuv_android_clang',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'arm',
           'TARGET_BITS': 32,
         },
+        'bot_type': 'builder',
         'testing': {'platform': 'linux'},
       },
       'android_arm64': {
         'recipe_config': 'libyuv_android',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'arm',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder',
         'testing': {'platform': 'linux'},
       },
      'android_x86': {
         'recipe_config': 'libyuv_android',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'intel',
           'TARGET_BITS': 32,
         },
+        'bot_type': 'builder',
         'testing': {'platform': 'linux'},
       },
       'android_x64': {
         'recipe_config': 'libyuv_android',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'intel',
           'TARGET_BITS': 64,
         },
+        'bot_type': 'builder',
         'testing': {'platform': 'linux'},
       },
       'android_mips': {
         'recipe_config': 'libyuv_android_clang',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'mipsel',
           'TARGET_BITS': 32,
         },
+        'bot_type': 'builder',
         'testing': {'platform': 'linux'},
       },
       'android_gn': {
         'recipe_config': 'libyuv_android',
         'chromium_apply_config': ['gn'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'arm',
           'TARGET_BITS': 32,
         },
+        'bot_type': 'builder',
         'testing': {'platform': 'linux'},
       },
       'android_gn_rel': {
         'recipe_config': 'libyuv_android',
         'chromium_apply_config': ['gn'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'arm',
           'TARGET_BITS': 32,
         },
+        'bot_type': 'builder',
         'testing': {'platform': 'linux'},
       },
     },
   },
 })
-
-def RunSteps(api):
-  mastername = api.properties.get('mastername')
-  buildername = api.properties.get('buildername')
-  master_dict = BUILDERS.get(mastername, {})
-  bot_config = master_dict.get('builders', {}).get(buildername)
-  assert bot_config, ('Unrecognized builder name "%r" for master "%r".' %
-                      (buildername, mastername))
-  recipe_config_name = bot_config['recipe_config']
-  recipe_config = RECIPE_CONFIGS.get(recipe_config_name)
-  assert recipe_config, ('Cannot find recipe_config "%s" for builder "%r".' %
-                         (recipe_config_name, buildername))
-
-  api.chromium.set_config(recipe_config['chromium_config'],
-                          **bot_config.get('chromium_config_kwargs', {}))
-  api.gclient.set_config(recipe_config['gclient_config'])
-  for c in bot_config.get('gclient_apply_config', []):
-    api.gclient.apply_config(c)
-  for c in bot_config.get('chromium_apply_config', []):
-    api.chromium.apply_config(c)
-
-  if api.tryserver.is_tryserver:
-    api.chromium.apply_config('trybot_flavor')
-
-  api.bot_update.ensure_checkout(force=True)
-  api.chromium.ensure_goma()
-  api.chromium.runhooks()
-
-  if api.chromium.c.project_generator.tool == 'gn':
-    api.chromium.run_gn(use_goma=True)
-    api.chromium.compile(targets=['all'])
-  else:
-    api.chromium.compile()
-    if api.chromium.c.TARGET_PLATFORM in ('win', 'mac', 'linux'):
-      api.chromium.runtest('libyuv_unittest')
-
-
-def _sanitize_nonalpha(text):
-  return ''.join(c if c.isalnum() else '_' for c in text.lower())
-
-
-def GenTests(api):
-  def generate_builder(mastername, buildername, revision, suffix=None):
-    suffix = suffix or ''
-    bot_config = BUILDERS[mastername]['builders'][buildername]
-
-    chromium_kwargs = bot_config.get('chromium_config_kwargs', {})
-    test = (
-      api.test('%s_%s%s' % (_sanitize_nonalpha(mastername),
-                            _sanitize_nonalpha(buildername), suffix)) +
-      api.properties(mastername=mastername,
-                     buildername=buildername,
-                     slavename='slavename',
-                     BUILD_CONFIG=chromium_kwargs['BUILD_CONFIG']) +
-      api.platform(bot_config['testing']['platform'],
-                   chromium_kwargs.get('TARGET_BITS', 64))
-    )
-
-    if revision:
-      test += api.properties(revision=revision)
-
-    if mastername.startswith('tryserver'):
-      test += api.properties(patch_url='try_job_svn_patch')
-    return test
-
-  for mastername, master_config in BUILDERS.iteritems():
-    for buildername in master_config['builders'].keys():
-      yield generate_builder(mastername, buildername, revision='12345')
-
-  # Forced builds (not specifying any revision) and test failures.
-  mastername = 'client.libyuv'
-  yield generate_builder(mastername, 'Linux64 Debug', revision=None,
-                         suffix='_forced')
-  yield generate_builder(mastername, 'Android Debug', revision=None,
-                         suffix='_forced')
-
-  yield generate_builder('tryserver.libyuv', 'linux', revision=None,
-                         suffix='_forced')