| Index: master/slaves.cfg
|
| ===================================================================
|
| --- master/slaves.cfg (revision 8794)
|
| +++ master/slaves.cfg (working copy)
|
| @@ -8,6 +8,9 @@
|
| # See master.experimental/slaves.cfg for documentation.
|
|
|
|
|
| +from skia_master_scripts import utils
|
| +
|
| +
|
| INTEGER_WIDTH = 3
|
| CONCURRENT_BUILDERS = 8
|
| COMPILE_BUILDERS = 10
|
| @@ -17,56 +20,32 @@
|
| DEFAULT_ANDROID_SDK_ROOT = '/home/chrome-bot/android-sdk-linux'
|
| DEFAULT_NACL_SDK_ROOT = '/home/chrome-bot/nacl_sdk/pepper_25'
|
| LINUX_COMPILE_BUILDERS = [
|
| - 'Skia_Shuttle_Ubuntu12_ATI5770_Float_Compile_Debug_32',
|
| - 'Skia_Shuttle_Ubuntu12_ATI5770_Float_Compile_Release_32',
|
| - 'Skia_Shuttle_Ubuntu12_ATI5770_Float_Compile_Debug_64',
|
| - 'Skia_Shuttle_Ubuntu12_ATI5770_Float_Compile_Release_64',
|
| - 'Skia_NexusS_4-1_Float_Compile_Debug_32',
|
| - 'Skia_NexusS_4-1_Float_Compile_Release_32',
|
| - 'Skia_Xoom_4-1_Float_Compile_Debug_32',
|
| - 'Skia_Xoom_4-1_Float_Compile_Release_32',
|
| - 'Skia_GalaxyNexus_4-1_Float_Compile_Debug_32',
|
| - 'Skia_GalaxyNexus_4-1_Float_Compile_Release_32',
|
| - 'Skia_Nexus4_4-1_Float_Compile_Debug_32',
|
| - 'Skia_Nexus4_4-1_Float_Compile_Release_32',
|
| - 'Skia_Nexus7_4-1_Float_Compile_Debug_32',
|
| - 'Skia_Nexus7_4-1_Float_Compile_Release_32',
|
| - 'Skia_Nexus10_4-1_Float_Compile_Debug_32',
|
| - 'Skia_Nexus10_4-1_Float_Compile_Release_32',
|
| - 'Skia_RazrI_4-1_Float_Compile_Debug_32',
|
| - 'Skia_RazrI_4-1_Float_Compile_Release_32',
|
| - 'Skia_Linux_NoGPU_Compile_Debug_32',
|
| - 'Skia_Linux_NoGPU_Compile_Release_32',
|
| - 'Skia_ChromeOS_Alex_Compile_Debug_32',
|
| - 'Skia_ChromeOS_Alex_Compile_Release_32',
|
| - 'Skia_Shuttle_Ubuntu12_NaCl_Compile_Debug',
|
| - 'Skia_Shuttle_Ubuntu12_NaCl_Compile_Release',
|
| - 'Skia_Shuttle_Ubuntu12_ATI5770_Float_Compile_Debug_32_Trybot',
|
| - 'Skia_Shuttle_Ubuntu12_ATI5770_Float_Compile_Release_32_Trybot',
|
| - 'Skia_Shuttle_Ubuntu12_ATI5770_Float_Compile_Debug_64_Trybot',
|
| - 'Skia_Shuttle_Ubuntu12_ATI5770_Float_Compile_Release_64_Trybot',
|
| - 'Skia_NexusS_4-1_Float_Compile_Debug_32_Trybot',
|
| - 'Skia_NexusS_4-1_Float_Compile_Release_32_Trybot',
|
| - 'Skia_Xoom_4-1_Float_Compile_Debug_32_Trybot',
|
| - 'Skia_Xoom_4-1_Float_Compile_Release_32_Trybot',
|
| - 'Skia_GalaxyNexus_4-1_Float_Compile_Debug_32_Trybot',
|
| - 'Skia_GalaxyNexus_4-1_Float_Compile_Release_32_Trybot',
|
| - 'Skia_Nexus4_4-1_Float_Compile_Debug_32_Trybot',
|
| - 'Skia_Nexus4_4-1_Float_Compile_Release_32_Trybot',
|
| - 'Skia_Nexus7_4-1_Float_Compile_Debug_32_Trybot',
|
| - 'Skia_Nexus7_4-1_Float_Compile_Release_32_Trybot',
|
| - 'Skia_Nexus10_4-1_Float_Compile_Debug_32_Trybot',
|
| - 'Skia_Nexus10_4-1_Float_Compile_Release_32_Trybot',
|
| - 'Skia_RazrI_4-1_Float_Compile_Debug_32_Trybot',
|
| - 'Skia_RazrI_4-1_Float_Compile_Release_32_Trybot',
|
| - 'Skia_Linux_NoGPU_Compile_Debug_32_Trybot',
|
| - 'Skia_Linux_NoGPU_Compile_Release_32_Trybot',
|
| - 'Skia_ChromeOS_Alex_Compile_Debug_32_Trybot',
|
| - 'Skia_ChromeOS_Alex_Compile_Release_32_Trybot',
|
| - 'Skia_Shuttle_Ubuntu12_NaCl_Compile_Debug_Trybot',
|
| - 'Skia_Shuttle_Ubuntu12_NaCl_Compile_Release_Trybot',
|
| + 'Build-Ubuntu12-GCC-x86-Debug',
|
| + 'Build-Ubuntu12-GCC-x86-Release',
|
| + 'Build-Ubuntu12-GCC-x86_64-Debug',
|
| + 'Build-Ubuntu12-GCC-x86_64-Release',
|
| + 'Build-Ubuntu12-GCC-x86_64-Debug-NoGPU',
|
| + 'Build-Ubuntu12-GCC-NaCl-Debug',
|
| + 'Build-Ubuntu12-GCC-NaCl-Release',
|
| + 'Build-Ubuntu12-GCC-Arm7-Debug-NexusS',
|
| + 'Build-Ubuntu12-GCC-Arm7-Release-NexusS',
|
| + 'Build-Ubuntu12-GCC-Arm7-Debug-Xoom',
|
| + 'Build-Ubuntu12-GCC-Arm7-Release-Xoom',
|
| + 'Build-Ubuntu12-GCC-Arm7-Debug-GalaxyNexus',
|
| + 'Build-Ubuntu12-GCC-Arm7-Release-GalaxyNexus',
|
| + 'Build-Ubuntu12-GCC-Arm7-Debug-Nexus4',
|
| + 'Build-Ubuntu12-GCC-Arm7-Release-Nexus4',
|
| + 'Build-Ubuntu12-GCC-Arm7-Debug-Nexus7',
|
| + 'Build-Ubuntu12-GCC-Arm7-Release-Nexus7',
|
| + 'Build-Ubuntu12-GCC-Arm7-Debug-Nexus10',
|
| + 'Build-Ubuntu12-GCC-Arm7-Release-Nexus10',
|
| + 'Build-Ubuntu12-GCC-x86-Debug-RazrI',
|
| + 'Build-Ubuntu12-GCC-x86-Release-RazrI',
|
| + 'Build-Ubuntu12-GCC-x86-Debug-ChromeOS',
|
| + 'Build-Ubuntu12-GCC-x86-Release-ChromeOS',
|
| ]
|
|
|
| +
|
| def _Format(obj, dictionary):
|
| """ Recursively apply the dictionary to any format strings in the requested
|
| object. Returns a copy and does not modify the original. """
|
| @@ -81,6 +60,7 @@
|
| return rv
|
| return obj
|
|
|
| +
|
| def SelfReferenceFormat(dictionary):
|
| """ Apply a format string to a dictionary in order to allow self-referencial
|
| keys and values. For example:
|
| @@ -104,17 +84,21 @@
|
| """
|
| return _Format(dictionary, dictionary)
|
|
|
| +
|
| +def AddTrybots(slave_dict):
|
| + slave_dict['builder'].extend(
|
| + [builder + utils.BUILDER_NAME_SEP + utils.TRYBOT_NAME_SUFFIX \
|
| + for builder in slave_dict['builder']])
|
| +
|
| +
|
| slaves = [SelfReferenceFormat(d) for d in [
|
| {
|
| 'master': 'Skia',
|
| 'hostname': 'skiabot-shuttle-ubuntu12-nexuss-001',
|
| 'builder': [
|
| - 'Skia_NexusS_4-1_Float_Debug_32',
|
| - 'Skia_NexusS_4-1_Float_Release_32',
|
| - 'Skia_NexusS_4-1_Float_Bench_32',
|
| - 'Skia_NexusS_4-1_Float_Debug_32_Trybot',
|
| - 'Skia_NexusS_4-1_Float_Release_32_Trybot',
|
| - 'Skia_NexusS_4-1_Float_Bench_32_Trybot',
|
| + 'Test-Android-NexusS-SGX540-Arm7-Debug',
|
| + 'Test-Android-NexusS-SGX540-Arm7-Release',
|
| + 'Perf-Android-NexusS-SGX540-Arm7-Release',
|
| ],
|
| 'serial': '3835BCDAEF6F00EC',
|
| 'num_cores': '2',
|
| @@ -125,12 +109,9 @@
|
| 'master': 'Skia',
|
| 'hostname': 'skiabot-shuttle-ubuntu12-nexuss-002',
|
| 'builder': [
|
| - 'Skia_NexusS_4-1_Float_Debug_32',
|
| - 'Skia_NexusS_4-1_Float_Release_32',
|
| - 'Skia_NexusS_4-1_Float_Bench_32',
|
| - 'Skia_NexusS_4-1_Float_Debug_32_Trybot',
|
| - 'Skia_NexusS_4-1_Float_Release_32_Trybot',
|
| - 'Skia_NexusS_4-1_Float_Bench_32_Trybot',
|
| + 'Test-Android-NexusS-SGX540-Arm7-Debug',
|
| + 'Test-Android-NexusS-SGX540-Arm7-Release',
|
| + 'Perf-Android-NexusS-SGX540-Arm7-Release',
|
| ],
|
| 'serial': '3935B4F8CA4B00EC',
|
| 'num_cores': '2',
|
| @@ -141,12 +122,9 @@
|
| 'master': 'Skia',
|
| 'hostname': 'skiabot-shuttle-ubuntu12-xoom-001',
|
| 'builder': [
|
| - 'Skia_Xoom_4-1_Float_Debug_32',
|
| - 'Skia_Xoom_4-1_Float_Release_32',
|
| - 'Skia_Xoom_4-1_Float_Bench_32',
|
| - 'Skia_Xoom_4-1_Float_Debug_32_Trybot',
|
| - 'Skia_Xoom_4-1_Float_Release_32_Trybot',
|
| - 'Skia_Xoom_4-1_Float_Bench_32_Trybot',
|
| + 'Test-Android-Xoom-Tegra2-Arm7-Debug',
|
| + 'Test-Android-Xoom-Tegra2-Arm7-Release',
|
| + 'Perf-Android-Xoom-Tegra2-Arm7-Release',
|
| ],
|
| 'serial': '1700618542c101d7',
|
| 'num_cores': '2',
|
| @@ -157,12 +135,9 @@
|
| 'master': 'Skia',
|
| 'hostname': 'skiabot-shuttle-ubuntu12-xoom-002',
|
| 'builder': [
|
| - 'Skia_Xoom_4-1_Float_Debug_32',
|
| - 'Skia_Xoom_4-1_Float_Release_32',
|
| - 'Skia_Xoom_4-1_Float_Bench_32',
|
| - 'Skia_Xoom_4-1_Float_Debug_32_Trybot',
|
| - 'Skia_Xoom_4-1_Float_Release_32_Trybot',
|
| - 'Skia_Xoom_4-1_Float_Bench_32_Trybot',
|
| + 'Test-Android-Xoom-Tegra2-Arm7-Debug',
|
| + 'Test-Android-Xoom-Tegra2-Arm7-Release',
|
| + 'Perf-Android-Xoom-Tegra2-Arm7-Release',
|
| ],
|
| 'serial': '027c104942212397',
|
| 'num_cores': '2',
|
| @@ -173,12 +148,9 @@
|
| 'master': 'Skia',
|
| 'hostname': 'skiabot-shuttle-ubuntu12-xoom-003',
|
| 'builder': [
|
| - 'Skia_Xoom_4-1_Float_Debug_32',
|
| - 'Skia_Xoom_4-1_Float_Release_32',
|
| - 'Skia_Xoom_4-1_Float_Bench_32',
|
| - 'Skia_Xoom_4-1_Float_Debug_32_Trybot',
|
| - 'Skia_Xoom_4-1_Float_Release_32_Trybot',
|
| - 'Skia_Xoom_4-1_Float_Bench_32_Trybot',
|
| + 'Test-Android-Xoom-Tegra2-Arm7-Debug',
|
| + 'Test-Android-Xoom-Tegra2-Arm7-Release',
|
| + 'Perf-Android-Xoom-Tegra2-Arm7-Release',
|
| ],
|
| 'serial': '1700618443a00497',
|
| 'num_cores': '2',
|
| @@ -189,12 +161,9 @@
|
| 'master': 'Skia',
|
| 'hostname': 'skiabot-shuttle-ubuntu12-galaxynexus-001',
|
| 'builder': [
|
| - 'Skia_GalaxyNexus_4-1_Float_Debug_32',
|
| - 'Skia_GalaxyNexus_4-1_Float_Release_32',
|
| - 'Skia_GalaxyNexus_4-1_Float_Bench_32',
|
| - 'Skia_GalaxyNexus_4-1_Float_Debug_32_Trybot',
|
| - 'Skia_GalaxyNexus_4-1_Float_Release_32_Trybot',
|
| - 'Skia_GalaxyNexus_4-1_Float_Bench_32_Trybot',
|
| + 'Test-Android-GalaxyNexus-SGX540-Arm7-Debug',
|
| + 'Test-Android-GalaxyNexus-SGX540-Arm7-Release',
|
| + 'Perf-Android-GalaxyNexus-SGX540-Arm7-Release',
|
| ],
|
| 'serial': '0149A97C1601B015',
|
| 'num_cores': '2',
|
| @@ -205,12 +174,9 @@
|
| 'master': 'Skia',
|
| 'hostname': 'skiabot-shuttle-ubuntu12-nexus4-001',
|
| 'builder': [
|
| - 'Skia_Nexus4_4-1_Float_Debug_32',
|
| - 'Skia_Nexus4_4-1_Float_Release_32',
|
| - 'Skia_Nexus4_4-1_Float_Bench_32',
|
| - 'Skia_Nexus4_4-1_Float_Debug_32_Trybot',
|
| - 'Skia_Nexus4_4-1_Float_Release_32_Trybot',
|
| - 'Skia_Nexus4_4-1_Float_Bench_32_Trybot',
|
| + 'Test-Android-Nexus4-Adreno320-Arm7-Debug',
|
| + 'Test-Android-Nexus4-Adreno320-Arm7-Release',
|
| + 'Perf-Android-Nexus4-Adreno320-Arm7-Release',
|
| ],
|
| 'serial': '0012746f51cea6b9',
|
| 'num_cores': '4',
|
| @@ -221,12 +187,9 @@
|
| 'master': 'Skia',
|
| 'hostname': 'skiabot-shuttle-ubuntu12-nexus7-001',
|
| 'builder': [
|
| - 'Skia_Nexus7_4-1_Float_Debug_32',
|
| - 'Skia_Nexus7_4-1_Float_Release_32',
|
| - 'Skia_Nexus7_4-1_Float_Bench_32',
|
| - 'Skia_Nexus7_4-1_Float_Debug_32_Trybot',
|
| - 'Skia_Nexus7_4-1_Float_Release_32_Trybot',
|
| - 'Skia_Nexus7_4-1_Float_Bench_32_Trybot',
|
| + 'Test-Android-Nexus7-Tegra3-Arm7-Debug',
|
| + 'Test-Android-Nexus7-Tegra3-Arm7-Release',
|
| + 'Perf-Android-Nexus7-Tegra3-Arm7-Release',
|
| ],
|
| 'serial': '015d210a13480604',
|
| 'num_cores': '4',
|
| @@ -237,12 +200,9 @@
|
| 'master': 'Skia',
|
| 'hostname': 'skiabot-shuttle-ubuntu12-nexus7-002',
|
| 'builder': [
|
| - 'Skia_Nexus7_4-1_Float_Debug_32',
|
| - 'Skia_Nexus7_4-1_Float_Release_32',
|
| - 'Skia_Nexus7_4-1_Float_Bench_32',
|
| - 'Skia_Nexus7_4-1_Float_Debug_32_Trybot',
|
| - 'Skia_Nexus7_4-1_Float_Release_32_Trybot',
|
| - 'Skia_Nexus7_4-1_Float_Bench_32_Trybot',
|
| + 'Test-Android-Nexus7-Tegra3-Arm7-Debug',
|
| + 'Test-Android-Nexus7-Tegra3-Arm7-Release',
|
| + 'Perf-Android-Nexus7-Tegra3-Arm7-Release',
|
| ],
|
| 'serial': '015d18848c280217',
|
| 'num_cores': '4',
|
| @@ -253,12 +213,9 @@
|
| 'master': 'Skia',
|
| 'hostname': 'skiabot-shuttle-ubuntu12-nexus7-003',
|
| 'builder': [
|
| - 'Skia_Nexus7_4-1_Float_Debug_32',
|
| - 'Skia_Nexus7_4-1_Float_Release_32',
|
| - 'Skia_Nexus7_4-1_Float_Bench_32',
|
| - 'Skia_Nexus7_4-1_Float_Debug_32_Trybot',
|
| - 'Skia_Nexus7_4-1_Float_Release_32_Trybot',
|
| - 'Skia_Nexus7_4-1_Float_Bench_32_Trybot',
|
| + 'Test-Android-Nexus7-Tegra3-Arm7-Debug',
|
| + 'Test-Android-Nexus7-Tegra3-Arm7-Release',
|
| + 'Perf-Android-Nexus7-Tegra3-Arm7-Release',
|
| ],
|
| 'serial': '015d16897c401e17',
|
| 'num_cores': '4',
|
| @@ -269,14 +226,11 @@
|
| 'master': 'Skia',
|
| 'hostname': 'skiabot-shuttle-ubuntu12-nexus10-001',
|
| 'builder': [
|
| - 'Skia_Nexus10_4-1_Float_Debug_32',
|
| - 'Skia_Nexus10_4-1_Float_Release_32',
|
| - 'Skia_Nexus10_4-1_Float_Bench_32',
|
| - 'Skia_Nexus10_4-1_Float_Debug_32_Trybot',
|
| - 'Skia_Nexus10_4-1_Float_Release_32_Trybot',
|
| - 'Skia_Nexus10_4-1_Float_Bench_32_Trybot',
|
| + 'Test-Android-Nexus10-MaliT604-Arm7-Debug',
|
| + 'Test-Android-Nexus10-MaliT604-Arm7-Release',
|
| + 'Perf-Android-Nexus10-MaliT604-Arm7-Release',
|
| ],
|
| - 'serial': 'R32C801B5LH',
|
| + 'serial': 'Rx86C801B5LH',
|
| 'num_cores': '2',
|
| 'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION],
|
| 'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT,
|
| @@ -285,14 +239,11 @@
|
| 'master': 'Skia',
|
| 'hostname': 'skiabot-shuttle-ubuntu12-nexus10-002',
|
| 'builder': [
|
| - 'Skia_Nexus10_4-1_Float_Debug_32',
|
| - 'Skia_Nexus10_4-1_Float_Release_32',
|
| - 'Skia_Nexus10_4-1_Float_Bench_32',
|
| - 'Skia_Nexus10_4-1_Float_Debug_32_Trybot',
|
| - 'Skia_Nexus10_4-1_Float_Release_32_Trybot',
|
| - 'Skia_Nexus10_4-1_Float_Bench_32_Trybot',
|
| + 'Test-Android-Nexus10-MaliT604-Arm7-Debug',
|
| + 'Test-Android-Nexus10-MaliT604-Arm7-Release',
|
| + 'Perf-Android-Nexus10-MaliT604-Arm7-Release',
|
| ],
|
| - 'serial': 'R32C801B86F',
|
| + 'serial': 'Rx86C801B86F',
|
| 'num_cores': '2',
|
| 'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION],
|
| 'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT,
|
| @@ -301,14 +252,11 @@
|
| 'master': 'Skia',
|
| 'hostname': 'skiabot-shuttle-ubuntu12-nexus10-003',
|
| 'builder': [
|
| - 'Skia_Nexus10_4-1_Float_Debug_32',
|
| - 'Skia_Nexus10_4-1_Float_Release_32',
|
| - 'Skia_Nexus10_4-1_Float_Bench_32',
|
| - 'Skia_Nexus10_4-1_Float_Debug_32_Trybot',
|
| - 'Skia_Nexus10_4-1_Float_Release_32_Trybot',
|
| - 'Skia_Nexus10_4-1_Float_Bench_32_Trybot',
|
| + 'Test-Android-Nexus10-MaliT604-Arm7-Debug',
|
| + 'Test-Android-Nexus10-MaliT604-Arm7-Release',
|
| + 'Perf-Android-Nexus10-MaliT604-Arm7-Release',
|
| ],
|
| - 'serial': 'R32CB017X2L',
|
| + 'serial': 'Rx86CB017X2L',
|
| 'num_cores': '2',
|
| 'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION],
|
| 'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT,
|
| @@ -317,12 +265,9 @@
|
| 'master': 'Skia',
|
| 'hostname': 'skiabot-shuttle-ubuntu12-razri-001',
|
| 'builder': [
|
| - 'Skia_RazrI_4-1_Float_Debug_32',
|
| - 'Skia_RazrI_4-1_Float_Release_32',
|
| - 'Skia_RazrI_4-1_Float_Bench_32',
|
| - 'Skia_RazrI_4-1_Float_Debug_32_Trybot',
|
| - 'Skia_RazrI_4-1_Float_Release_32_Trybot',
|
| - 'Skia_RazrI_4-1_Float_Bench_32_Trybot',
|
| + 'Test-Android-RazrI-SGX540-x86-Debug',
|
| + 'Test-Android-RazrI-SGX540-x86-Release',
|
| + 'Perf-Android-RazrI-SGX540-x86-Release',
|
| ],
|
| 'serial': 'TA23702Z9Y',
|
| 'num_cores': '1',
|
| @@ -334,8 +279,7 @@
|
| 'master': 'Skia',
|
| 'hostname': 'skiabot-shuttle-ubuntu12-001',
|
| 'builder': [
|
| - 'Skia_Linux_NoGPU_Debug_32',
|
| - 'Skia_Linux_NoGPU_Debug_32_Trybot',
|
| + 'Test-Ubuntu12-ShuttleA-NoGPU-x86_64-Debug',
|
| ],
|
| 'num_cores': '8',
|
| },
|
| @@ -343,12 +287,9 @@
|
| 'master': 'Skia',
|
| 'hostname': 'skiabot-shuttle-ubuntu12-002',
|
| 'builder': [
|
| - 'Skia_ChromeOS_Alex_Debug_32',
|
| - 'Skia_ChromeOS_Alex_Release_32',
|
| - 'Skia_ChromeOS_Alex_Bench_32',
|
| - 'Skia_ChromeOS_Alex_Debug_32_Trybot',
|
| - 'Skia_ChromeOS_Alex_Release_32_Trybot',
|
| - 'Skia_ChromeOS_Alex_Bench_32_Trybot',
|
| + 'Test-ChromeOS-Alex-GMA3150-x86-Debug',
|
| + 'Test-ChromeOS-Alex-GMA3150-x86-Release',
|
| + 'Perf-ChromeOS-Alex-GMA3150-x86-Release',
|
|
|
| ],
|
| 'ssh_host': '192.168.1.134',
|
| @@ -358,18 +299,12 @@
|
| 'master': 'Skia',
|
| 'hostname': 'skiabot-shuttle-ubuntu12-ati5770-001',
|
| 'builder': [
|
| - 'Skia_Shuttle_Ubuntu12_ATI5770_Float_Debug_32',
|
| - 'Skia_Shuttle_Ubuntu12_ATI5770_Float_Release_32',
|
| - 'Skia_Shuttle_Ubuntu12_ATI5770_Float_Bench_32',
|
| - 'Skia_Shuttle_Ubuntu12_ATI5770_Float_Debug_64',
|
| - 'Skia_Shuttle_Ubuntu12_ATI5770_Float_Release_64',
|
| - 'Skia_Shuttle_Ubuntu12_ATI5770_Float_Bench_64',
|
| - 'Skia_Shuttle_Ubuntu12_ATI5770_Float_Debug_32_Trybot',
|
| - 'Skia_Shuttle_Ubuntu12_ATI5770_Float_Release_32_Trybot',
|
| - 'Skia_Shuttle_Ubuntu12_ATI5770_Float_Bench_32_Trybot',
|
| - 'Skia_Shuttle_Ubuntu12_ATI5770_Float_Debug_64_Trybot',
|
| - 'Skia_Shuttle_Ubuntu12_ATI5770_Float_Release_64_Trybot',
|
| - 'Skia_Shuttle_Ubuntu12_ATI5770_Float_Bench_64_Trybot',
|
| + 'Test-Ubuntu12-ShuttleA-ATI5770-x86-Debug',
|
| + 'Test-Ubuntu12-ShuttleA-ATI5770-x86-Release',
|
| + 'Perf-Ubuntu12-ShuttleA-ATI5770-x86-Release',
|
| + 'Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Debug',
|
| + 'Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release',
|
| + 'Perf-Ubuntu12-ShuttleA-ATI5770-x86_64-Release',
|
| ],
|
| 'num_cores': '8',
|
| },
|
| @@ -378,14 +313,10 @@
|
| 'master': 'Skia',
|
| 'hostname': 'skiabot-macmini-10_6-%s' % ('%d' % i).zfill(INTEGER_WIDTH),
|
| 'builder': [
|
| - 'Skia_Mac_Float_Debug_32',
|
| - 'Skia_Mac_Float_Release_32',
|
| - 'Skia_Mac_Float_Debug_64',
|
| - 'Skia_Mac_Float_Release_64',
|
| - 'Skia_Mac_Float_Debug_32_Trybot',
|
| - 'Skia_Mac_Float_Release_32_Trybot',
|
| - 'Skia_Mac_Float_Debug_64_Trybot',
|
| - 'Skia_Mac_Float_Release_64_Trybot',
|
| + 'Test-Mac10.6-MacMini4.1-GeForce320M-x86-Debug',
|
| + 'Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release',
|
| + 'Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Debug',
|
| + 'Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Release',
|
| ],
|
| 'num_cores': '4',
|
| } for i in range(CONCURRENT_BUILDERS)
|
| @@ -394,14 +325,10 @@
|
| 'master': 'Skia',
|
| 'hostname': 'skiabot-macmini-10_7-%s' % ('%d' % i).zfill(INTEGER_WIDTH),
|
| 'builder': [
|
| - 'Skia_MacMiniLion_Float_Debug_32',
|
| - 'Skia_MacMiniLion_Float_Release_32',
|
| - 'Skia_MacMiniLion_Float_Debug_64',
|
| - 'Skia_MacMiniLion_Float_Release_64',
|
| - 'Skia_MacMiniLion_Float_Debug_32_Trybot',
|
| - 'Skia_MacMiniLion_Float_Release_32_Trybot',
|
| - 'Skia_MacMiniLion_Float_Debug_64_Trybot',
|
| - 'Skia_MacMiniLion_Float_Release_64_Trybot',
|
| + 'Test-Mac10.7-MacMini4.1-GeForce320M-x86-Debug',
|
| + 'Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release',
|
| + 'Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug',
|
| + 'Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Release',
|
| ],
|
| 'num_cores': '4',
|
| } for i in range(CONCURRENT_BUILDERS)
|
| @@ -410,14 +337,10 @@
|
| 'master': 'Skia',
|
| 'hostname': 'skiabot-macmini-10_8-%s' % ('%d' % i).zfill(INTEGER_WIDTH),
|
| 'builder': [
|
| - 'Skia_MacMini_10_8_Float_Debug_32',
|
| - 'Skia_MacMini_10_8_Float_Release_32',
|
| - 'Skia_MacMini_10_8_Float_Debug_64',
|
| - 'Skia_MacMini_10_8_Float_Release_64',
|
| - 'Skia_MacMini_10_8_Float_Debug_32_Trybot',
|
| - 'Skia_MacMini_10_8_Float_Release_32_Trybot',
|
| - 'Skia_MacMini_10_8_Float_Debug_64_Trybot',
|
| - 'Skia_MacMini_10_8_Float_Release_64_Trybot',
|
| + 'Test-Mac10.8-MacMini4.1-GeForce320M-x86-Debug',
|
| + 'Test-Mac10.8-MacMini4.1-GeForce320M-x86-Release',
|
| + 'Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Debug',
|
| + 'Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Release',
|
| ],
|
| 'num_cores': '4',
|
| } for i in range(CONCURRENT_BUILDERS)
|
| @@ -426,14 +349,10 @@
|
| 'master': 'Skia',
|
| 'hostname': 'skiabot-shuttle-win7-intel-%s' % ('%d' % i).zfill(INTEGER_WIDTH),
|
| 'builder': [
|
| - 'Skia_Shuttle_Win7_Intel_Float_Debug_32',
|
| - 'Skia_Shuttle_Win7_Intel_Float_Release_32',
|
| - 'Skia_Shuttle_Win7_Intel_Float_Debug_64',
|
| - 'Skia_Shuttle_Win7_Intel_Float_Release_64',
|
| - 'Skia_Shuttle_Win7_Intel_Float_Debug_32_Trybot',
|
| - 'Skia_Shuttle_Win7_Intel_Float_Release_32_Trybot',
|
| - 'Skia_Shuttle_Win7_Intel_Float_Debug_64_Trybot',
|
| - 'Skia_Shuttle_Win7_Intel_Float_Release_64_Trybot',
|
| + 'Test-Win7-ShuttleA-HD2000-x86-Debug',
|
| + 'Test-Win7-ShuttleA-HD2000-x86-Release',
|
| + 'Test-Win7-ShuttleA-HD2000-x86_64-Debug',
|
| + 'Test-Win7-ShuttleA-HD2000-x86_64-Release',
|
| ],
|
| 'num_cores': '8',
|
| } for i in range(CONCURRENT_BUILDERS)
|
| @@ -442,14 +361,10 @@
|
| 'master': 'Skia',
|
| 'hostname': 'skiabot-shuttle-win7-intel-special-%s' % ('%d' % i).zfill(INTEGER_WIDTH),
|
| 'builder': [
|
| - 'Skia_Shuttle_Win7_Intel_Float_ANGLE_Debug_32',
|
| - 'Skia_Shuttle_Win7_Intel_Float_ANGLE_Release_32',
|
| - 'Skia_Shuttle_Win7_Intel_Float_DirectWrite_Debug_32',
|
| - 'Skia_Shuttle_Win7_Intel_Float_DirectWrite_Release_32',
|
| - 'Skia_Shuttle_Win7_Intel_Float_ANGLE_Debug_32_Trybot',
|
| - 'Skia_Shuttle_Win7_Intel_Float_ANGLE_Release_32_Trybot',
|
| - 'Skia_Shuttle_Win7_Intel_Float_DirectWrite_Debug_32_Trybot',
|
| - 'Skia_Shuttle_Win7_Intel_Float_DirectWrite_Release_32_Trybot',
|
| + 'Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE',
|
| + 'Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE',
|
| + 'Test-Win7-ShuttleA-HD2000-x86-Debug-DirectWrite',
|
| + 'Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite',
|
| ],
|
| 'num_cores': '8',
|
| } for i in range(CONCURRENT_BUILDERS)
|
| @@ -458,64 +373,50 @@
|
| 'master': 'Skia',
|
| 'hostname': 'skiabot-macmini-10_6-bench',
|
| 'builder': [
|
| - 'Skia_Mac_Float_Bench_32',
|
| - 'Skia_Mac_Float_Bench_64',
|
| - 'Skia_Mac_Float_Bench_32_Trybot',
|
| - 'Skia_Mac_Float_Bench_64_Trybot',
|
| + 'Perf-Mac10.6-MacMini4.1-GeForce320M-x86-Release',
|
| + 'Perf-Mac10.6-MacMini4.1-GeForce320M-x86_64-Release',
|
| ],
|
| },
|
| {
|
| 'master': 'Skia',
|
| 'hostname': 'skiabot-macmini-10_7-bench',
|
| 'builder': [
|
| - 'Skia_MacMiniLion_Float_Bench_32',
|
| - 'Skia_MacMiniLion_Float_Bench_64',
|
| - 'Skia_MacMiniLion_Float_Bench_32_Trybot',
|
| - 'Skia_MacMiniLion_Float_Bench_64_Trybot',
|
| + 'Perf-Mac10.7-MacMini4.1-GeForce320M-x86-Release',
|
| + 'Perf-Mac10.7-MacMini4.1-GeForce320M-x86_64-Release',
|
| ],
|
| },
|
| {
|
| 'master': 'Skia',
|
| 'hostname': 'skiabot-macmini-10_8-bench',
|
| 'builder': [
|
| - 'Skia_MacMini_10_8_Float_Bench_32',
|
| - 'Skia_MacMini_10_8_Float_Bench_64',
|
| - 'Skia_MacMini_10_8_Float_Bench_32_Trybot',
|
| - 'Skia_MacMini_10_8_Float_Bench_64_Trybot',
|
| + 'Perf-Mac10.8-MacMini4.1-GeForce320M-x86-Release',
|
| + 'Perf-Mac10.8-MacMini4.1-GeForce320M-x86_64-Release',
|
| ],
|
| },
|
| {
|
| 'master': 'Skia',
|
| 'hostname': 'skiabot-shuttle-win7-intel-bench',
|
| 'builder': [
|
| - 'Skia_Shuttle_Win7_Intel_Float_Bench_64',
|
| - 'Skia_Shuttle_Win7_Intel_Float_Bench_32',
|
| - 'Skia_Shuttle_Win7_Intel_Float_ANGLE_Bench_32',
|
| - 'Skia_Shuttle_Win7_Intel_Float_DirectWrite_Bench_32',
|
| - 'Skia_Shuttle_Win7_Intel_Float_Bench_64_Trybot',
|
| - 'Skia_Shuttle_Win7_Intel_Float_Bench_32_Trybot',
|
| - 'Skia_Shuttle_Win7_Intel_Float_ANGLE_Bench_32_Trybot',
|
| - 'Skia_Shuttle_Win7_Intel_Float_DirectWrite_Bench_32_Trybot',
|
| + 'Perf-Win7-ShuttleA-HD2000-x86-Release',
|
| + 'Perf-Win7-ShuttleA-HD2000-x86_64-Release',
|
| + 'Perf-Win7-ShuttleA-HD2000-x86-Release-ANGLE',
|
| + 'Perf-Win7-ShuttleA-HD2000-x86-Release-DirectWrite',
|
| ],
|
| },
|
| {
|
| 'master': 'Skia',
|
| 'hostname': 'skia-housekeeping-slave-a',
|
| 'builder': [
|
| - 'Skia_PerCommit_House_Keeping',
|
| - 'Skia_Periodic_House_Keeping',
|
| - 'Skia_PerCommit_House_Keeping_Trybot',
|
| - 'Skia_Periodic_House_Keeping_Trybot',
|
| + 'Housekeeper-PerCommit',
|
| + 'Housekeeper-Nightly',
|
| ],
|
| },
|
| {
|
| 'master': 'Skia',
|
| 'hostname': 'skia-housekeeping-slave-b',
|
| 'builder': [
|
| - 'Skia_PerCommit_House_Keeping',
|
| - 'Skia_Periodic_House_Keeping',
|
| - 'Skia_PerCommit_House_Keeping_Trybot',
|
| - 'Skia_Periodic_House_Keeping_Trybot',
|
| + 'Housekeeper-PerCommit',
|
| + 'Housekeeper-Nightly',
|
| ],
|
| },
|
| ] + [
|
| @@ -541,14 +442,10 @@
|
| 'master': 'Skia',
|
| 'hostname': 'skiabot-mac-10_6-compile-%s' % ('%d' % i).zfill(INTEGER_WIDTH),
|
| 'builder': [
|
| - 'Skia_Mac_Float_Compile_Debug_32',
|
| - 'Skia_Mac_Float_Compile_Release_32',
|
| - 'Skia_Mac_Float_Compile_Debug_64',
|
| - 'Skia_Mac_Float_Compile_Release_64',
|
| - 'Skia_Mac_Float_Compile_Debug_32_Trybot',
|
| - 'Skia_Mac_Float_Compile_Release_32_Trybot',
|
| - 'Skia_Mac_Float_Compile_Debug_64_Trybot',
|
| - 'Skia_Mac_Float_Compile_Release_64_Trybot',
|
| + 'Build-Mac10.6-GCC-x86-Debug',
|
| + 'Build-Mac10.6-GCC-x86-Release',
|
| + 'Build-Mac10.6-GCC-x86_64-Debug',
|
| + 'Build-Mac10.6-GCC-x86_64-Release',
|
| ],
|
| 'num_cores': '8',
|
| } for i in range(COMPILE_BUILDERS)
|
| @@ -557,18 +454,12 @@
|
| 'master': 'Skia',
|
| 'hostname': 'skiabot-mac-10_7-compile-%s' % ('%d' % i).zfill(INTEGER_WIDTH),
|
| 'builder': [
|
| - 'Skia_MacMiniLion_Float_Compile_Debug_32',
|
| - 'Skia_MacMiniLion_Float_Compile_Release_32',
|
| - 'Skia_MacMiniLion_Float_Compile_Debug_64',
|
| - 'Skia_MacMiniLion_Float_Compile_Release_64',
|
| - 'Skia_iOS_Compile_Debug_32',
|
| - 'Skia_iOS_Compile_Release_32',
|
| - 'Skia_MacMiniLion_Float_Compile_Debug_32_Trybot',
|
| - 'Skia_MacMiniLion_Float_Compile_Release_32_Trybot',
|
| - 'Skia_MacMiniLion_Float_Compile_Debug_64_Trybot',
|
| - 'Skia_MacMiniLion_Float_Compile_Release_64_Trybot',
|
| - 'Skia_iOS_Compile_Debug_32_Trybot',
|
| - 'Skia_iOS_Compile_Release_32_Trybot',
|
| + 'Build-Mac10.7-Clang-x86-Debug',
|
| + 'Build-Mac10.7-Clang-x86-Release',
|
| + 'Build-Mac10.7-Clang-x86_64-Debug',
|
| + 'Build-Mac10.7-Clang-x86_64-Release',
|
| + 'Build-Mac10.7-Clang-Arm7-Debug-iOS',
|
| + 'Build-Mac10.7-Clang-Arm7-Release-iOS',
|
| ],
|
| 'num_cores': '8',
|
| } for i in range(COMPILE_BUILDERS)
|
| @@ -577,14 +468,10 @@
|
| 'master': 'Skia',
|
| 'hostname': 'skiabot-mac-10_8-compile-%s' % ('%d' % i).zfill(INTEGER_WIDTH),
|
| 'builder': [
|
| - 'Skia_MacMini_10_8_Float_Compile_Debug_32',
|
| - 'Skia_MacMini_10_8_Float_Compile_Release_32',
|
| - 'Skia_MacMini_10_8_Float_Compile_Debug_64',
|
| - 'Skia_MacMini_10_8_Float_Compile_Release_64',
|
| - 'Skia_MacMini_10_8_Float_Compile_Debug_32_Trybot',
|
| - 'Skia_MacMini_10_8_Float_Compile_Release_32_Trybot',
|
| - 'Skia_MacMini_10_8_Float_Compile_Debug_64_Trybot',
|
| - 'Skia_MacMini_10_8_Float_Compile_Release_64_Trybot',
|
| + 'Build-Mac10.8-Clang-x86-Debug',
|
| + 'Build-Mac10.8-Clang-x86-Release',
|
| + 'Build-Mac10.8-Clang-x86_64-Debug',
|
| + 'Build-Mac10.8-Clang-x86_64-Release',
|
| ],
|
| 'num_cores': '8',
|
| } for i in range(COMPILE_BUILDERS)
|
| @@ -593,23 +480,19 @@
|
| 'master': 'Skia',
|
| 'hostname': 'skiabot-win-compile-%s' % ('%d' % i).zfill(INTEGER_WIDTH),
|
| 'builder': [
|
| - 'Skia_Shuttle_Win7_Intel_Float_Compile_Debug_32',
|
| - 'Skia_Shuttle_Win7_Intel_Float_Compile_Release_32',
|
| - 'Skia_Shuttle_Win7_Intel_Float_Compile_Debug_64',
|
| - 'Skia_Shuttle_Win7_Intel_Float_Compile_Release_64',
|
| - 'Skia_Shuttle_Win7_Intel_Float_ANGLE_Compile_Debug_32',
|
| - 'Skia_Shuttle_Win7_Intel_Float_ANGLE_Compile_Release_32',
|
| - 'Skia_Shuttle_Win7_Intel_Float_DirectWrite_Compile_Debug_32',
|
| - 'Skia_Shuttle_Win7_Intel_Float_DirectWrite_Compile_Release_32',
|
| - 'Skia_Shuttle_Win7_Intel_Float_Compile_Debug_32_Trybot',
|
| - 'Skia_Shuttle_Win7_Intel_Float_Compile_Release_32_Trybot',
|
| - 'Skia_Shuttle_Win7_Intel_Float_Compile_Debug_64_Trybot',
|
| - 'Skia_Shuttle_Win7_Intel_Float_Compile_Release_64_Trybot',
|
| - 'Skia_Shuttle_Win7_Intel_Float_ANGLE_Compile_Debug_32_Trybot',
|
| - 'Skia_Shuttle_Win7_Intel_Float_ANGLE_Compile_Release_32_Trybot',
|
| - 'Skia_Shuttle_Win7_Intel_Float_DirectWrite_Compile_Debug_32_Trybot',
|
| - 'Skia_Shuttle_Win7_Intel_Float_DirectWrite_Compile_Release_32_Trybot',
|
| + 'Build-Win7-VS2010-x86-Debug',
|
| + 'Build-Win7-VS2010-x86-Release',
|
| + 'Build-Win7-VS2010-x86_64-Debug',
|
| + 'Build-Win7-VS2010-x86_64-Release',
|
| + 'Build-Win7-VS2010-x86-Debug-ANGLE',
|
| + 'Build-Win7-VS2010-x86-Release-ANGLE',
|
| + 'Build-Win7-VS2010-x86-Debug-DirectWrite',
|
| + 'Build-Win7-VS2010-x86-Release-DirectWrite',
|
| ],
|
| 'num_cores': '8',
|
| } for i in range(COMPILE_BUILDERS)
|
| ]]
|
| +
|
| +
|
| +for slave_dict in slaves:
|
| + AddTrybots(slave_dict)
|
|
|
Chromium Code Reviews
