Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1048)

Unified Diff: master/slaves.cfg

Issue 13861012: Change builder names (Closed) Base URL: http://skia.googlecode.com/svn/buildbot/
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« master/master_builders_cfg.py ('K') | « master/skia_master_scripts/utils.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: master/slaves.cfg
===================================================================
--- master/slaves.cfg (revision 8727)
+++ master/slaves.cfg (working copy)
@@ -17,54 +17,54 @@
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',
+ 'Ubuntu-12-ATI5770-32-DebugCompile',
+ 'Ubuntu-12-ATI5770-32-ReleaseCompile',
+ 'Ubuntu-12-ATI5770-64-DebugCompile',
+ 'Ubuntu-12-ATI5770-64-ReleaseCompile',
+ 'Android-x-NexusS-32-DebugCompile',
epoger 2013/04/19 16:25:44 To avoid all these "-x-"es , we *could* just roll
borenet 2013/04/22 16:29:55 I think this is a good idea. We could also option
+ 'Android-x-NexusS-32-ReleaseCompile',
+ 'Android-x-Xoom-32-DebugCompile',
+ 'Android-x-Xoom-32-ReleaseCompile',
+ 'Android-x-GalaxyNexus-32-DebugCompile',
+ 'Android-x-GalaxyNexus-32-ReleaseCompile',
+ 'Android-x-Nexus4-32-DebugCompile',
+ 'Android-x-Nexus4-32-ReleaseCompile',
+ 'Android-x-Nexus7-32-DebugCompile',
+ 'Android-x-Nexus7-32-ReleaseCompile',
+ 'Android-x-Nexus10-32-DebugCompile',
+ 'Android-x-Nexus10-32-ReleaseCompile',
+ 'Android-x-RazrI-32-DebugCompile',
+ 'Android-x-RazrI-32-ReleaseCompile',
+ 'Ubuntu-12-NoGPU-32-DebugCompile',
+ 'Ubuntu-12-NoGPU-32-ReleaseCompile',
+ 'ChromeOS-x-Alex-32-DebugCompile',
+ 'ChromeOS-x-Alex-32-ReleaseCompile',
+ 'Ubuntu-12-NaCl-32_64-DebugCompile',
+ 'Ubuntu-12-NaCl-32_64-ReleaseCompile',
+ 'Ubuntu-12-ATI5770-32-DebugCompile-Trybot',
+ 'Ubuntu-12-ATI5770-32-ReleaseCompile-Trybot',
+ 'Ubuntu-12-ATI5770-64-DebugCompile-Trybot',
+ 'Ubuntu-12-ATI5770-64-ReleaseCompile-Trybot',
+ 'Android-x-NexusS-32-DebugCompile-Trybot',
+ 'Android-x-NexusS-32-ReleaseCompile-Trybot',
+ 'Android-x-Xoom-32-DebugCompile-Trybot',
+ 'Android-x-Xoom-32-ReleaseCompile-Trybot',
+ 'Android-x-GalaxyNexus-32-DebugCompile-Trybot',
+ 'Android-x-GalaxyNexus-32-ReleaseCompile-Trybot',
+ 'Android-x-Nexus4-32-DebugCompile-Trybot',
+ 'Android-x-Nexus4-32-ReleaseCompile-Trybot',
+ 'Android-x-Nexus7-32-DebugCompile-Trybot',
+ 'Android-x-Nexus7-32-ReleaseCompile-Trybot',
+ 'Android-x-Nexus10-32-DebugCompile-Trybot',
+ 'Android-x-Nexus10-32-ReleaseCompile-Trybot',
+ 'Android-x-RazrI-32-DebugCompile-Trybot',
+ 'Android-x-RazrI-32-ReleaseCompile-Trybot',
+ 'Ubuntu-12-NoGPU-32-DebugCompile-Trybot',
epoger 2013/04/19 16:25:44 These NoGPU builders are bugging me. They are the
borenet 2013/04/22 16:29:55 Agreed. And in that case, it's a build configurat
+ 'Ubuntu-12-NoGPU-32-ReleaseCompile-Trybot',
+ 'ChromeOS-x-Alex-32-DebugCompile-Trybot',
+ 'ChromeOS-x-Alex-32-ReleaseCompile-Trybot',
+ 'Ubuntu-12-NaCl-32_64-DebugCompile-Trybot',
+ 'Ubuntu-12-NaCl-32_64-ReleaseCompile-Trybot',
]
def _Format(obj, dictionary):
@@ -109,12 +109,12 @@
'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',
+ 'Android-x-NexusS-32-Debug',
+ 'Android-x-NexusS-32-Release',
+ 'Android-x-NexusS-32-Bench',
+ 'Android-x-NexusS-32-Debug-Trybot',
+ 'Android-x-NexusS-32-Release-Trybot',
+ 'Android-x-NexusS-32-Bench-Trybot',
],
'serial': '3835BCDAEF6F00EC',
'num_cores': '2',
@@ -125,12 +125,12 @@
'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',
+ 'Android-x-NexusS-32-Debug',
+ 'Android-x-NexusS-32-Release',
+ 'Android-x-NexusS-32-Bench',
+ 'Android-x-NexusS-32-Debug-Trybot',
+ 'Android-x-NexusS-32-Release-Trybot',
+ 'Android-x-NexusS-32-Bench-Trybot',
],
'serial': '3935B4F8CA4B00EC',
'num_cores': '2',
@@ -141,12 +141,12 @@
'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',
+ 'Android-x-Xoom-32-Debug',
+ 'Android-x-Xoom-32-Release',
+ 'Android-x-Xoom-32-Bench',
+ 'Android-x-Xoom-32-Debug-Trybot',
+ 'Android-x-Xoom-32-Release-Trybot',
+ 'Android-x-Xoom-32-Bench-Trybot',
],
'serial': '1700618542c101d7',
'num_cores': '2',
@@ -157,12 +157,12 @@
'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',
+ 'Android-x-Xoom-32-Debug',
+ 'Android-x-Xoom-32-Release',
+ 'Android-x-Xoom-32-Bench',
+ 'Android-x-Xoom-32-Debug-Trybot',
+ 'Android-x-Xoom-32-Release-Trybot',
+ 'Android-x-Xoom-32-Bench-Trybot',
],
'serial': '027c104942212397',
'num_cores': '2',
@@ -173,12 +173,12 @@
'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',
+ 'Android-x-Xoom-32-Debug',
+ 'Android-x-Xoom-32-Release',
+ 'Android-x-Xoom-32-Bench',
+ 'Android-x-Xoom-32-Debug-Trybot',
+ 'Android-x-Xoom-32-Release-Trybot',
+ 'Android-x-Xoom-32-Bench-Trybot',
],
'serial': '1700618443a00497',
'num_cores': '2',
@@ -189,12 +189,12 @@
'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',
+ 'Android-x-GalaxyNexus-32-Debug',
+ 'Android-x-GalaxyNexus-32-Release',
+ 'Android-x-GalaxyNexus-32-Bench',
+ 'Android-x-GalaxyNexus-32-Debug-Trybot',
+ 'Android-x-GalaxyNexus-32-Release-Trybot',
+ 'Android-x-GalaxyNexus-32-Bench-Trybot',
],
'serial': '0149A97C1601B015',
'num_cores': '2',
@@ -205,12 +205,12 @@
'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',
+ 'Android-x-Nexus4-32-Debug',
+ 'Android-x-Nexus4-32-Release',
+ 'Android-x-Nexus4-32-Bench',
+ 'Android-x-Nexus4-32-Debug-Trybot',
+ 'Android-x-Nexus4-32-Release-Trybot',
+ 'Android-x-Nexus4-32-Bench-Trybot',
],
'serial': '0012746f51cea6b9',
'num_cores': '4',
@@ -221,12 +221,12 @@
'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',
+ 'Android-x-Nexus7-32-Debug',
+ 'Android-x-Nexus7-32-Release',
+ 'Android-x-Nexus7-32-Bench',
+ 'Android-x-Nexus7-32-Debug-Trybot',
+ 'Android-x-Nexus7-32-Release-Trybot',
+ 'Android-x-Nexus7-32-Bench-Trybot',
],
'serial': '015d210a13480604',
'num_cores': '4',
@@ -237,12 +237,12 @@
'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',
+ 'Android-x-Nexus7-32-Debug',
+ 'Android-x-Nexus7-32-Release',
+ 'Android-x-Nexus7-32-Bench',
+ 'Android-x-Nexus7-32-Debug-Trybot',
+ 'Android-x-Nexus7-32-Release-Trybot',
+ 'Android-x-Nexus7-32-Bench-Trybot',
],
'serial': '015d18848c280217',
'num_cores': '4',
@@ -253,12 +253,12 @@
'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',
+ 'Android-x-Nexus7-32-Debug',
+ 'Android-x-Nexus7-32-Release',
+ 'Android-x-Nexus7-32-Bench',
+ 'Android-x-Nexus7-32-Debug-Trybot',
+ 'Android-x-Nexus7-32-Release-Trybot',
+ 'Android-x-Nexus7-32-Bench-Trybot',
],
'serial': '015d16897c401e17',
'num_cores': '4',
@@ -269,12 +269,12 @@
'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',
+ 'Android-x-Nexus10-32-Debug',
+ 'Android-x-Nexus10-32-Release',
+ 'Android-x-Nexus10-32-Bench',
+ 'Android-x-Nexus10-32-Debug-Trybot',
+ 'Android-x-Nexus10-32-Release-Trybot',
+ 'Android-x-Nexus10-32-Bench-Trybot',
],
'serial': 'R32C801B5LH',
'num_cores': '2',
@@ -285,12 +285,12 @@
'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',
+ 'Android-x-Nexus10-32-Debug',
+ 'Android-x-Nexus10-32-Release',
+ 'Android-x-Nexus10-32-Bench',
+ 'Android-x-Nexus10-32-Debug-Trybot',
+ 'Android-x-Nexus10-32-Release-Trybot',
+ 'Android-x-Nexus10-32-Bench-Trybot',
],
'serial': 'R32C801B86F',
'num_cores': '2',
@@ -301,12 +301,12 @@
'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',
+ 'Android-x-Nexus10-32-Debug',
+ 'Android-x-Nexus10-32-Release',
+ 'Android-x-Nexus10-32-Bench',
+ 'Android-x-Nexus10-32-Debug-Trybot',
+ 'Android-x-Nexus10-32-Release-Trybot',
+ 'Android-x-Nexus10-32-Bench-Trybot',
],
'serial': 'R32CB017X2L',
'num_cores': '2',
@@ -317,12 +317,12 @@
'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',
+ 'Android-x-RazrI-32-Debug',
+ 'Android-x-RazrI-32-Release',
+ 'Android-x-RazrI-32-Bench',
+ 'Android-x-RazrI-32-Debug-Trybot',
+ 'Android-x-RazrI-32-Release-Trybot',
+ 'Android-x-RazrI-32-Bench-Trybot',
],
'serial': 'TA23702Z9Y',
'num_cores': '1',
@@ -334,8 +334,8 @@
'master': 'Skia',
'hostname': 'skiabot-shuttle-ubuntu12-001',
'builder': [
- 'Skia_Linux_NoGPU_Debug_32',
- 'Skia_Linux_NoGPU_Debug_32_Trybot',
+ 'Ubuntu-12-NoGPU-32-Debug',
+ 'Ubuntu-12-NoGPU-32-Debug-Trybot',
],
'num_cores': '8',
},
@@ -343,13 +343,12 @@
'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',
-
+ 'ChromeOS-x-Alex-32-Debug',
+ 'ChromeOS-x-Alex-32-Release',
+ 'ChromeOS-x-Alex-32-Bench',
+ 'ChromeOS-x-Alex-32-Debug-Trybot',
+ 'ChromeOS-x-Alex-32-Release-Trybot',
+ 'ChromeOS-x-Alex-32-Bench-Trybot',
],
'ssh_host': '192.168.1.134',
'ssh_port': '22',
@@ -358,18 +357,18 @@
'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',
+ 'Ubuntu-12-ATI5770-32-Debug',
+ 'Ubuntu-12-ATI5770-32-Release',
+ 'Ubuntu-12-ATI5770-32-Bench',
epoger 2013/04/19 16:25:44 I think it would be better for the 32/64 field to
borenet 2013/04/22 16:29:55 Done. However, it comes *before* extra_config, so
+ 'Ubuntu-12-ATI5770-64-Debug',
+ 'Ubuntu-12-ATI5770-64-Release',
+ 'Ubuntu-12-ATI5770-64-Bench',
+ 'Ubuntu-12-ATI5770-32-Debug-Trybot',
+ 'Ubuntu-12-ATI5770-32-Release-Trybot',
+ 'Ubuntu-12-ATI5770-32-Bench-Trybot',
+ 'Ubuntu-12-ATI5770-64-Debug-Trybot',
+ 'Ubuntu-12-ATI5770-64-Release-Trybot',
+ 'Ubuntu-12-ATI5770-64-Bench-Trybot',
],
'num_cores': '8',
},
@@ -378,14 +377,14 @@
'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',
+ 'OSX-10_6-MacMini-32-Debug',
+ 'OSX-10_6-MacMini-32-Release',
+ 'OSX-10_6-MacMini-64-Debug',
+ 'OSX-10_6-MacMini-64-Release',
+ 'OSX-10_6-MacMini-32-Debug-Trybot',
+ 'OSX-10_6-MacMini-32-Release-Trybot',
+ 'OSX-10_6-MacMini-64-Debug-Trybot',
+ 'OSX-10_6-MacMini-64-Release-Trybot',
],
'num_cores': '4',
} for i in range(CONCURRENT_BUILDERS)
@@ -394,14 +393,14 @@
'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',
+ 'OSX-10_7-MacMini-32-Debug',
epoger 2013/04/19 16:25:44 I think we should try to allow '.' in the version
borenet 2013/04/22 16:29:55 Done.
+ 'OSX-10_7-MacMini-32-Release',
+ 'OSX-10_7-MacMini-64-Debug',
epoger 2013/04/19 16:25:44 I still prefer "Mac" to "OSX". I think it's clear
borenet 2013/04/22 16:29:55 Done.
+ 'OSX-10_7-MacMini-64-Release',
+ 'OSX-10_7-MacMini-32-Debug-Trybot',
+ 'OSX-10_7-MacMini-32-Release-Trybot',
+ 'OSX-10_7-MacMini-64-Debug-Trybot',
+ 'OSX-10_7-MacMini-64-Release-Trybot',
],
'num_cores': '4',
} for i in range(CONCURRENT_BUILDERS)
@@ -410,14 +409,14 @@
'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',
+ 'OSX-10_8-MacMini-32-Debug',
+ 'OSX-10_8-MacMini-32-Release',
+ 'OSX-10_8-MacMini-64-Debug',
+ 'OSX-10_8-MacMini-64-Release',
+ 'OSX-10_8-MacMini-32-Debug-Trybot',
+ 'OSX-10_8-MacMini-32-Release-Trybot',
+ 'OSX-10_8-MacMini-64-Debug-Trybot',
+ 'OSX-10_8-MacMini-64-Release-Trybot',
],
'num_cores': '4',
} for i in range(CONCURRENT_BUILDERS)
@@ -426,14 +425,14 @@
'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',
+ 'Win-7-Intel-32-Debug',
+ 'Win-7-Intel-32-Release',
+ 'Win-7-Intel-64-Debug',
+ 'Win-7-Intel-64-Release',
+ 'Win-7-Intel-32-Debug-Trybot',
+ 'Win-7-Intel-32-Release-Trybot',
+ 'Win-7-Intel-64-Debug-Trybot',
+ 'Win-7-Intel-64-Release-Trybot',
],
'num_cores': '8',
} for i in range(CONCURRENT_BUILDERS)
@@ -442,14 +441,14 @@
'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',
+ 'Win-7-Intel-32-Debug-ANGLE',
+ 'Win-7-Intel-32-Release-ANGLE',
+ 'Win-7-Intel-32-Debug-DirectWrite',
+ 'Win-7-Intel-32-Release-DirectWrite',
+ 'Win-7-Intel-32-Debug-ANGLE-Trybot',
+ 'Win-7-Intel-32-Release-ANGLE-Trybot',
+ 'Win-7-Intel-32-Debug-DirectWrite-Trybot',
+ 'Win-7-Intel-32-Release-DirectWrite-Trybot',
],
'num_cores': '8',
} for i in range(CONCURRENT_BUILDERS)
@@ -458,64 +457,64 @@
'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',
+ 'OSX-10_6-MacMini-32-Bench',
+ 'OSX-10_6-MacMini-64-Bench',
+ 'OSX-10_6-MacMini-32-Bench-Trybot',
+ 'OSX-10_6-MacMini-64-Bench-Trybot',
],
},
{
'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',
+ 'OSX-10_7-MacMini-32-Bench',
+ 'OSX-10_7-MacMini-64-Bench',
+ 'OSX-10_7-MacMini-32-Bench-Trybot',
+ 'OSX-10_7-MacMini-64-Bench-Trybot',
],
},
{
'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',
+ 'OSX-10_8-MacMini-32-Bench',
+ 'OSX-10_8-MacMini-64-Bench',
+ 'OSX-10_8-MacMini-32-Bench-Trybot',
+ 'OSX-10_8-MacMini-64-Bench-Trybot',
],
},
{
'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',
+ 'Win-7-Intel-32-Bench',
+ 'Win-7-Intel-64-Bench',
+ 'Win-7-Intel-32-Bench-ANGLE',
+ 'Win-7-Intel-32-Bench-DirectWrite',
+ 'Win-7-Intel-32-Bench-Trybot',
+ 'Win-7-Intel-64-Bench-Trybot',
+ 'Win-7-Intel-32-Bench-ANGLE-Trybot',
+ 'Win-7-Intel-32-Bench-DirectWrite-Trybot',
],
},
{
'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',
+ 'PerCommit-Housekeeping',
+ 'Periodic-Housekeeping',
+ 'PerCommit-Housekeeping-Trybot',
+ 'Periodic-Housekeeping-Trybot',
],
},
{
'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',
+ 'PerCommit-Housekeeping',
+ 'Periodic-Housekeeping',
+ 'PerCommit-Housekeeping-Trybot',
+ 'Periodic-Housekeeping-Trybot',
],
},
] + [
@@ -541,14 +540,14 @@
'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',
+ 'OSX-10_6-MacMini-32-DebugCompile',
+ 'OSX-10_6-MacMini-32-ReleaseCompile',
+ 'OSX-10_6-MacMini-64-DebugCompile',
+ 'OSX-10_6-MacMini-64-ReleaseCompile',
+ 'OSX-10_6-MacMini-32-DebugCompile-Trybot',
+ 'OSX-10_6-MacMini-32-ReleaseCompile-Trybot',
+ 'OSX-10_6-MacMini-64-DebugCompile-Trybot',
+ 'OSX-10_6-MacMini-64-ReleaseCompile-Trybot',
],
'num_cores': '8',
} for i in range(COMPILE_BUILDERS)
@@ -557,18 +556,18 @@
'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',
+ 'OSX-10_7-MacMini-32-DebugCompile',
epoger 2013/04/19 16:25:44 I think the way you have it set up now is reasonab
borenet 2013/04/22 16:29:55 I will keep it as-is for now, but I think we'll ne
+ 'OSX-10_7-MacMini-32-ReleaseCompile',
+ 'OSX-10_7-MacMini-64-DebugCompile',
+ 'OSX-10_7-MacMini-64-ReleaseCompile',
+ 'iOS-6-iPhone-32-DebugCompile',
+ 'iOS-6-iPhone-32-ReleaseCompile',
+ 'OSX-10_7-MacMini-32-DebugCompile-Trybot',
+ 'OSX-10_7-MacMini-32-ReleaseCompile-Trybot',
+ 'OSX-10_7-MacMini-64-DebugCompile-Trybot',
+ 'OSX-10_7-MacMini-64-ReleaseCompile-Trybot',
+ 'iOS-6-iPhone-32-DebugCompile-Trybot',
+ 'iOS-6-iPhone-32-ReleaseCompile-Trybot',
],
'num_cores': '8',
} for i in range(COMPILE_BUILDERS)
@@ -577,14 +576,14 @@
'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',
+ 'OSX-10_8-MacMini-32-DebugCompile',
+ 'OSX-10_8-MacMini-32-ReleaseCompile',
+ 'OSX-10_8-MacMini-64-DebugCompile',
+ 'OSX-10_8-MacMini-64-ReleaseCompile',
+ 'OSX-10_8-MacMini-32-DebugCompile-Trybot',
+ 'OSX-10_8-MacMini-32-ReleaseCompile-Trybot',
+ 'OSX-10_8-MacMini-64-DebugCompile-Trybot',
+ 'OSX-10_8-MacMini-64-ReleaseCompile-Trybot',
],
'num_cores': '8',
} for i in range(COMPILE_BUILDERS)
@@ -593,22 +592,22 @@
'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',
+ 'Win-7-Intel-32-DebugCompile',
+ 'Win-7-Intel-32-ReleaseCompile',
+ 'Win-7-Intel-64-DebugCompile',
+ 'Win-7-Intel-64-ReleaseCompile',
+ 'Win-7-Intel-32-DebugCompile-ANGLE',
+ 'Win-7-Intel-32-ReleaseCompile-ANGLE',
+ 'Win-7-Intel-32-DebugCompile-DirectWrite',
+ 'Win-7-Intel-32-ReleaseCompile-DirectWrite',
+ 'Win-7-Intel-32-DebugCompile-Trybot',
+ 'Win-7-Intel-32-ReleaseCompile-Trybot',
+ 'Win-7-Intel-64-DebugCompile-Trybot',
+ 'Win-7-Intel-64-ReleaseCompile-Trybot',
+ 'Win-7-Intel-32-DebugCompile-ANGLE-Trybot',
+ 'Win-7-Intel-32-ReleaseCompile-ANGLE-Trybot',
+ 'Win-7-Intel-32-DebugCompile-DirectWrite-Trybot',
+ 'Win-7-Intel-32-ReleaseCompile-DirectWrite-Trybot',
],
'num_cores': '8',
} for i in range(COMPILE_BUILDERS)
« master/master_builders_cfg.py ('K') | « master/skia_master_scripts/utils.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698