diff --git a/webrtc/build/mb_config.pyl b/webrtc/build/mb_config.pyl index db732a9a0f..d49edea51f 100644 --- a/webrtc/build/mb_config.pyl +++ b/webrtc/build/mb_config.pyl @@ -12,20 +12,64 @@ # easy to try different configurations of GYP and GN in tryjob patches. { + # This is a map of buildbot master names -> buildbot builder names -> + # config names (where each config name is a key in the 'configs' dict, + # above). mb uses this dict to look up which config to use for a given bot. + # The builders should be sorted by the order they appear in the /builders + # page on the buildbots, *not* alphabetically. + 'masters': { + 'client.webrtc': { + 'iOS32 Debug': 'ios_gyp_debug_bot_arm_device', + 'iOS32 Release': 'ios_gyp_release_bot_arm_device', + 'iOS64 Debug': 'ios_gyp_debug_bot_arm64_device', + 'iOS64 Release': 'ios_gyp_release_bot_arm64_device', + 'iOS32 Debug Simulator': 'ios_gyp_debug_bot_x86', + 'iOS64 Debug Simulator': 'ios_gyp_debug_bot_x64', + 'iOS64 Debug (GN)': 'ios_gn_debug_bot_arm64_device', + 'iOS64 Release (GN)': 'ios_gn_release_bot_arm64_device', + }, + 'tryserver.webrtc': { + 'ios_dbg': 'ios_gyp_debug_bot_arm_device', + 'ios_rel': 'ios_gyp_release_bot_arm_device', + 'ios_arm64_dbg': 'ios_gyp_debug_bot_arm64_device', + 'ios_arm64_rel': 'ios_gyp_release_bot_arm64_device', + 'ios32_sim_dbg': 'ios_gyp_debug_bot_x86', + 'ios64_sim_dbg': 'ios_gyp_debug_bot_x64', + 'ios64_gn_dbg': 'ios_gn_debug_bot_arm64_device', + 'ios64_gn_rel': 'ios_gn_release_bot_arm64_device', + }, + }, + # This is the list of configs that you can pass to mb; each config # represents a particular combination of GYP_DEFINES/gn args that # we must support. A given config *may* be platform-specific but # is not necessarily so (i.e., we might have mac, win, and linux # bots all using the 'gn_release_bot' config). 'configs': { - 'ios_gn_debug_bot_arm64_device': ['ios', 'gn', 'debug_bot', 'arm64', 'device'], - 'ios_gn_release_bot_arm64_device': ['ios', 'gn', 'release_bot', 'arm64', 'device'], - 'ios_gyp_debug_bot_arm_device': ['ios', 'gyp', 'debug_bot', 'arm', 'device'], - 'ios_gyp_release_bot_arm_device': ['ios', 'gyp', 'release_bot', 'arm', 'device'], - 'ios_gyp_debug_bot_arm64_device': ['ios', 'gyp', 'debug_bot', 'arm64', 'device'], - 'ios_gyp_release_bot_arm64_device': ['ios', 'gyp', 'release_bot', 'arm64', 'device'], - 'ios_gyp_debug_bot_x86': ['ios', 'gyp', 'debug_bot', 'x86'], - 'ios_gyp_debug_bot_x64': ['ios', 'gyp', 'release_bot', 'x64'], + 'ios_gn_debug_bot_arm64_device': [ + 'ios', 'gn', 'debug_bot', 'arm64', 'device' + ], + 'ios_gn_release_bot_arm64_device': [ + 'ios', 'gn', 'release_bot', 'arm64', 'device' + ], + 'ios_gyp_debug_bot_arm_device': [ + 'ios', 'gyp', 'debug_bot', 'arm', 'device' + ], + 'ios_gyp_release_bot_arm_device': [ + 'ios', 'gyp', 'release_bot', 'arm', 'device' + ], + 'ios_gyp_debug_bot_arm64_device': [ + 'ios', 'gyp', 'debug_bot', 'arm64', 'device' + ], + 'ios_gyp_release_bot_arm64_device': [ + 'ios', 'gyp', 'release_bot', 'arm64', 'device' + ], + 'ios_gyp_debug_bot_x86': [ + 'ios', 'gyp', 'debug_bot', 'x86' + ], + 'ios_gyp_debug_bot_x64': [ + 'ios', 'gyp', 'release_bot', 'x64' + ], }, # This is a dict mapping a given 'mixin' name to a dict of settings that @@ -91,32 +135,4 @@ 'gyp_defines': 'target_arch=ia32', }, }, - - # This is a map of buildbot master names -> buildbot builder names -> - # config names (where each config name is a key in the 'configs' dict, - # above). mb uses this dict to look up which config to use for a given bot. - # The builders should be sorted by the order they appear in the /builders - # page on the buildbots, *not* alphabetically. - 'masters': { - 'client.webrtc': { - 'iOS32 Debug': 'ios_gyp_debug_bot_arm_device', - 'iOS32 Release': 'ios_gyp_release_bot_arm_device', - 'iOS64 Debug': 'ios_gyp_debug_bot_arm64_device', - 'iOS64 Release': 'ios_gyp_release_bot_arm64_device', - 'iOS32 Debug Simulator': 'ios_gyp_debug_bot_x86', - 'iOS64 Debug Simulator': 'ios_gyp_debug_bot_x64', - 'iOS64 Debug (GN)': 'ios_gn_debug_bot_arm64_device', - 'iOS64 Release (GN)': 'ios_gn_release_bot_arm64_device', - }, - 'tryserver.webrtc': { - 'ios_dbg': 'ios_gyp_debug_bot_arm_device', - 'ios_rel': 'ios_gyp_release_bot_arm_device', - 'ios_arm64_dbg': 'ios_gyp_debug_bot_arm64_device', - 'ios_arm64_rel': 'ios_gyp_release_bot_arm64_device', - 'ios32_sim_dbg': 'ios_gyp_debug_bot_x86', - 'ios64_sim_dbg': 'ios_gyp_debug_bot_x64', - 'ios64_gn_dbg': 'ios_gn_debug_bot_arm64_device', - 'ios64_gn_rel': 'ios_gn_release_bot_arm64_device', - }, - }, }