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

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/skia_master_scripts/utils.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 8570)
+++ master/slaves.cfg (working copy)
@@ -59,12 +59,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-4.1-32-NexusS-Debug',
+ 'Android-4.1-32-NexusS-Release',
+ 'Android-4.1-32-NexusS-Bench',
+ 'Android-4.1-32-NexusS-Debug-Trybot',
+ 'Android-4.1-32-NexusS-Release-Trybot',
+ 'Android-4.1-32-NexusS-Bench-Trybot',
],
'serial': '3835BCDAEF6F00EC',
'num_cores': '2',
@@ -75,12 +75,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-4.1-32-NexusS-Debug',
+ 'Android-4.1-32-NexusS-Release',
+ 'Android-4.1-32-NexusS-Bench',
+ 'Android-4.1-32-NexusS-Debug-Trybot',
+ 'Android-4.1-32-NexusS-Release-Trybot',
+ 'Android-4.1-32-NexusS-Bench-Trybot',
],
'serial': '3935B4F8CA4B00EC',
'num_cores': '2',
@@ -91,12 +91,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-4.1-32-Xoom-Debug',
+ 'Android-4.1-32-Xoom-Release',
+ 'Android-4.1-32-Xoom-Bench',
+ 'Android-4.1-32-Xoom-Debug-Trybot',
+ 'Android-4.1-32-Xoom-Release-Trybot',
+ 'Android-4.1-32-Xoom-Bench-Trybot',
],
'serial': '1700618542c101d7',
'num_cores': '2',
@@ -107,12 +107,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-4.1-32-Xoom-Debug',
+ 'Android-4.1-32-Xoom-Release',
+ 'Android-4.1-32-Xoom-Bench',
+ 'Android-4.1-32-Xoom-Debug-Trybot',
+ 'Android-4.1-32-Xoom-Release-Trybot',
+ 'Android-4.1-32-Xoom-Bench-Trybot',
],
'serial': '027c104942212397',
'num_cores': '2',
@@ -123,12 +123,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-4.1-32-Xoom-Debug',
+ 'Android-4.1-32-Xoom-Release',
+ 'Android-4.1-32-Xoom-Bench',
+ 'Android-4.1-32-Xoom-Debug-Trybot',
+ 'Android-4.1-32-Xoom-Release-Trybot',
+ 'Android-4.1-32-Xoom-Bench-Trybot',
],
'serial': '1700618443a00497',
'num_cores': '2',
@@ -139,12 +139,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-4.1-32-GalaxyNexus-Debug',
+ 'Android-4.1-32-GalaxyNexus-Release',
+ 'Android-4.1-32-GalaxyNexus-Bench',
+ 'Android-4.1-32-GalaxyNexus-Debug-Trybot',
+ 'Android-4.1-32-GalaxyNexus-Release-Trybot',
+ 'Android-4.1-32-GalaxyNexus-Bench-Trybot',
],
'serial': '0149A97C1601B015',
'num_cores': '2',
@@ -155,12 +155,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-4.1-32-Nexus4-Debug',
+ 'Android-4.1-32-Nexus4-Release',
+ 'Android-4.1-32-Nexus4-Bench',
+ 'Android-4.1-32-Nexus4-Debug-Trybot',
+ 'Android-4.1-32-Nexus4-Release-Trybot',
+ 'Android-4.1-32-Nexus4-Bench-Trybot',
],
'serial': '0012746f51cea6b9',
'num_cores': '4',
@@ -171,12 +171,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-4.1-32-Nexus7-Debug',
+ 'Android-4.1-32-Nexus7-Release',
+ 'Android-4.1-32-Nexus7-Bench',
+ 'Android-4.1-32-Nexus7-Debug-Trybot',
+ 'Android-4.1-32-Nexus7-Release-Trybot',
+ 'Android-4.1-32-Nexus7-Bench-Trybot',
],
'serial': '015d210a13480604',
'num_cores': '4',
@@ -187,12 +187,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-4.1-32-Nexus7-Debug',
+ 'Android-4.1-32-Nexus7-Release',
+ 'Android-4.1-32-Nexus7-Bench',
+ 'Android-4.1-32-Nexus7-Debug-Trybot',
+ 'Android-4.1-32-Nexus7-Release-Trybot',
+ 'Android-4.1-32-Nexus7-Bench-Trybot',
],
'serial': '015d18848c280217',
'num_cores': '4',
@@ -203,12 +203,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-4.1-32-Nexus7-Debug',
+ 'Android-4.1-32-Nexus7-Release',
+ 'Android-4.1-32-Nexus7-Bench',
+ 'Android-4.1-32-Nexus7-Debug-Trybot',
+ 'Android-4.1-32-Nexus7-Release-Trybot',
+ 'Android-4.1-32-Nexus7-Bench-Trybot',
],
'serial': '015d16897c401e17',
'num_cores': '4',
@@ -219,12 +219,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-4.1-32-Nexus10-Debug',
+ 'Android-4.1-32-Nexus10-Release',
+ 'Android-4.1-32-Nexus10-Bench',
+ 'Android-4.1-32-Nexus10-Debug-Trybot',
+ 'Android-4.1-32-Nexus10-Release-Trybot',
+ 'Android-4.1-32-Nexus10-Bench-Trybot',
],
'serial': 'R32C801B5LH',
'num_cores': '2',
@@ -235,12 +235,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-4.1-32-Nexus10-Debug',
+ 'Android-4.1-32-Nexus10-Release',
+ 'Android-4.1-32-Nexus10-Bench',
+ 'Android-4.1-32-Nexus10-Debug-Trybot',
+ 'Android-4.1-32-Nexus10-Release-Trybot',
+ 'Android-4.1-32-Nexus10-Bench-Trybot',
],
'serial': 'R32C801B86F',
'num_cores': '2',
@@ -251,12 +251,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-4.1-32-Nexus10-Debug',
+ 'Android-4.1-32-Nexus10-Release',
+ 'Android-4.1-32-Nexus10-Bench',
+ 'Android-4.1-32-Nexus10-Debug-Trybot',
+ 'Android-4.1-32-Nexus10-Release-Trybot',
+ 'Android-4.1-32-Nexus10-Bench-Trybot',
],
'serial': 'R32CB017X2L',
'num_cores': '2',
@@ -267,12 +267,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-4.1-32-RazrI-Debug',
+ 'Android-4.1-32-RazrI-Release',
+ 'Android-4.1-32-RazrI-Bench',
+ 'Android-4.1-32-RazrI-Debug-Trybot',
+ 'Android-4.1-32-RazrI-Release-Trybot',
+ 'Android-4.1-32-RazrI-Bench-Trybot',
],
'serial': 'TA23702Z9Y',
'num_cores': '1',
@@ -284,8 +284,8 @@
'master': 'Skia',
'hostname': 'skiabot-shuttle-ubuntu12-001',
'builder': [
- 'Skia_Linux_NoGPU_Debug_32',
- 'Skia_Linux_NoGPU_Debug_32_Trybot',
+ 'Linux-Ubuntu12-32-NoGPU-Debug',
+ 'Linux-Ubuntu12-32-NoGPU-Debug-Trybot',
],
'num_cores': '8',
},
@@ -293,13 +293,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-V-32-Alex-Debug',
+ 'ChromeOS-V-32-Alex-Release',
+ 'ChromeOS-V-32-Alex-Bench',
+ 'ChromeOS-V-32-Alex-Debug-Trybot',
+ 'ChromeOS-V-32-Alex-Release-Trybot',
+ 'ChromeOS-V-32-Alex-Bench-Trybot',
],
'ssh_host': '192.168.1.134',
'ssh_port': '22',
@@ -308,18 +307,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',
+ 'Linux-Ubuntu12-32-ATI5770-Debug',
epoger 2013/04/09 17:38:36 With the changes discussed above, I think this wil
+ 'Linux-Ubuntu12-32-ATI5770-Release',
+ 'Linux-Ubuntu12-32-ATI5770-Bench',
+ 'Linux-Ubuntu12-64-ATI5770-Debug',
+ 'Linux-Ubuntu12-64-ATI5770-Release',
+ 'Linux-Ubuntu12-64-ATI5770-Bench',
+ 'Linux-Ubuntu12-32-ATI5770-Debug-Trybot',
+ 'Linux-Ubuntu12-32-ATI5770-Release-Trybot',
+ 'Linux-Ubuntu12-32-ATI5770-Bench-Trybot',
+ 'Linux-Ubuntu12-64-ATI5770-Debug-Trybot',
+ 'Linux-Ubuntu12-64-ATI5770-Release-Trybot',
+ 'Linux-Ubuntu12-64-ATI5770-Bench-Trybot',
],
'num_cores': '8',
},
@@ -328,14 +327,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-32-MacMini-Debug',
+ 'OSX-10.6-32-MacMini-Release',
+ 'OSX-10.6-64-MacMini-Debug',
+ 'OSX-10.6-64-MacMini-Release',
+ 'OSX-10.6-32-MacMini-Debug-Trybot',
+ 'OSX-10.6-32-MacMini-Release-Trybot',
+ 'OSX-10.6-64-MacMini-Debug-Trybot',
+ 'OSX-10.6-64-MacMini-Release-Trybot',
],
'num_cores': '4',
} for i in range(CONCURRENT_BUILDERS)
@@ -344,14 +343,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-32-MacMini-Debug',
+ 'OSX-10.7-32-MacMini-Release',
+ 'OSX-10.7-64-MacMini-Debug',
+ 'OSX-10.7-64-MacMini-Release',
+ 'OSX-10.7-32-MacMini-Debug-Trybot',
+ 'OSX-10.7-32-MacMini-Release-Trybot',
+ 'OSX-10.7-64-MacMini-Debug-Trybot',
+ 'OSX-10.7-64-MacMini-Release-Trybot',
],
'num_cores': '4',
} for i in range(CONCURRENT_BUILDERS)
@@ -360,14 +359,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-32-MacMini-Debug',
epoger 2013/04/09 17:38:36 Or maybe... Mac-10.8-Macmini4,1-integrated-Debug-
+ 'OSX-10.8-32-MacMini-Release',
+ 'OSX-10.8-64-MacMini-Debug',
+ 'OSX-10.8-64-MacMini-Release',
+ 'OSX-10.8-32-MacMini-Debug-Trybot',
+ 'OSX-10.8-32-MacMini-Release-Trybot',
+ 'OSX-10.8-64-MacMini-Debug-Trybot',
+ 'OSX-10.8-64-MacMini-Release-Trybot',
],
'num_cores': '4',
} for i in range(CONCURRENT_BUILDERS)
@@ -376,14 +375,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-32-Intel-Debug',
+ 'Win-7-32-Intel-Release',
+ 'Win-7-64-Intel-Debug',
+ 'Win-7-64-Intel-Release',
+ 'Win-7-32-Intel-Debug-Trybot',
+ 'Win-7-32-Intel-Release-Trybot',
+ 'Win-7-64-Intel-Debug-Trybot',
+ 'Win-7-64-Intel-Release-Trybot',
],
'num_cores': '8',
} for i in range(CONCURRENT_BUILDERS)
@@ -392,14 +391,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-32-Intel-ANGLE-Debug',
epoger 2013/04/09 17:38:36 I would think extra_config would go at the END, an
+ 'Win-7-32-Intel-ANGLE-Release',
+ 'Win-7-32-Intel-DirectWrite-Debug',
+ 'Win-7-32-Intel-DirectWrite-Release',
+ 'Win-7-32-Intel-ANGLE-Debug-Trybot',
+ 'Win-7-32-Intel-ANGLE-Release-Trybot',
+ 'Win-7-32-Intel-DirectWrite-Debug-Trybot',
+ 'Win-7-32-Intel-DirectWrite-Release-Trybot',
],
'num_cores': '8',
} for i in range(CONCURRENT_BUILDERS)
@@ -408,64 +407,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-32-MacMini-Bench',
+ 'OSX-10.6-64-MacMini-Bench',
+ 'OSX-10.6-32-MacMini-Bench-Trybot',
+ 'OSX-10.6-64-MacMini-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-32-MacMini-Bench',
+ 'OSX-10.7-64-MacMini-Bench',
+ 'OSX-10.7-32-MacMini-Bench-Trybot',
+ 'OSX-10.7-64-MacMini-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-32-MacMini-Bench',
+ 'OSX-10.8-64-MacMini-Bench',
+ 'OSX-10.8-32-MacMini-Bench-Trybot',
+ 'OSX-10.8-64-MacMini-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-32-Intel-Bench',
+ 'Win-7-64-Intel-Bench',
+ 'Win-7-32-Intel-ANGLE-Bench',
+ 'Win-7-32-Intel-DirectWrite-Bench',
+ 'Win-7-32-Intel-Bench-Trybot',
+ 'Win-7-64-Intel-Bench-Trybot',
+ 'Win-7-32-Intel-ANGLE-Bench-Trybot',
+ 'Win-7-32-Intel-DirectWrite-Bench-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',
],
},
] + [
@@ -473,54 +472,54 @@
'master': 'Skia',
'hostname': 'skiabot-linux-compile-%s' % ('%d' % i).zfill(INTEGER_WIDTH),
'builder': [
- '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',
+ 'Linux-Ubuntu12-32-ATI5770-DebugCompile',
+ 'Linux-Ubuntu12-32-ATI5770-ReleaseCompile',
+ 'Linux-Ubuntu12-64-ATI5770-DebugCompile',
+ 'Linux-Ubuntu12-64-ATI5770-ReleaseCompile',
+ 'Android-4.1-32-NexusS-DebugCompile',
+ 'Android-4.1-32-NexusS-ReleaseCompile',
+ 'Android-4.1-32-Xoom-DebugCompile',
+ 'Android-4.1-32-Xoom-ReleaseCompile',
+ 'Android-4.1-32-GalaxyNexus-DebugCompile',
+ 'Android-4.1-32-GalaxyNexus-ReleaseCompile',
+ 'Android-4.1-32-Nexus4-DebugCompile',
+ 'Android-4.1-32-Nexus4-ReleaseCompile',
+ 'Android-4.1-32-Nexus7-DebugCompile',
+ 'Android-4.1-32-Nexus7-ReleaseCompile',
+ 'Android-4.1-32-Nexus10-DebugCompile',
+ 'Android-4.1-32-Nexus10-ReleaseCompile',
+ 'Android-4.1-32-RazrI-DebugCompile',
+ 'Android-4.1-32-RazrI-ReleaseCompile',
+ 'Linux-Ubuntu12-32-NoGPU-DebugCompile',
+ 'Linux-Ubuntu12-32-NoGPU-ReleaseCompile',
+ 'ChromeOS-V-32-Alex-DebugCompile',
+ 'ChromeOS-V-32-Alex-ReleaseCompile',
+ 'Linux-Ubuntu12-32_64-NaCl-DebugCompile',
+ 'Linux-Ubuntu12-32_64-NaCl-ReleaseCompile',
+ 'Linux-Ubuntu12-32-ATI5770-DebugCompile-Trybot',
+ 'Linux-Ubuntu12-32-ATI5770-ReleaseCompile-Trybot',
+ 'Linux-Ubuntu12-64-ATI5770-DebugCompile-Trybot',
+ 'Linux-Ubuntu12-64-ATI5770-ReleaseCompile-Trybot',
+ 'Android-4.1-32-NexusS-DebugCompile-Trybot',
+ 'Android-4.1-32-NexusS-ReleaseCompile-Trybot',
+ 'Android-4.1-32-Xoom-DebugCompile-Trybot',
+ 'Android-4.1-32-Xoom-ReleaseCompile-Trybot',
+ 'Android-4.1-32-GalaxyNexus-DebugCompile-Trybot',
+ 'Android-4.1-32-GalaxyNexus-ReleaseCompile-Trybot',
+ 'Android-4.1-32-Nexus4-DebugCompile-Trybot',
+ 'Android-4.1-32-Nexus4-ReleaseCompile-Trybot',
+ 'Android-4.1-32-Nexus7-DebugCompile-Trybot',
+ 'Android-4.1-32-Nexus7-ReleaseCompile-Trybot',
+ 'Android-4.1-32-Nexus10-DebugCompile-Trybot',
+ 'Android-4.1-32-Nexus10-ReleaseCompile-Trybot',
+ 'Android-4.1-32-RazrI-DebugCompile-Trybot',
+ 'Android-4.1-32-RazrI-ReleaseCompile-Trybot',
+ 'Linux-Ubuntu12-32-NoGPU-DebugCompile-Trybot',
+ 'Linux-Ubuntu12-32-NoGPU-ReleaseCompile-Trybot',
+ 'ChromeOS-V-32-Alex-DebugCompile-Trybot',
+ 'ChromeOS-V-32-Alex-ReleaseCompile-Trybot',
+ 'Linux-Ubuntu12-32_64-NaCl-DebugCompile-Trybot',
+ 'Linux-Ubuntu12-32_64-NaCl-ReleaseCompile-Trybot',
],
'num_cores': '8',
'android_sdk_root': '/usr/local/google/home/borenet/android_sdk_linux',
@@ -531,14 +530,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-32-MacMini-DebugCompile',
+ 'OSX-10.6-32-MacMini-ReleaseCompile',
+ 'OSX-10.6-64-MacMini-DebugCompile',
+ 'OSX-10.6-64-MacMini-ReleaseCompile',
+ 'OSX-10.6-32-MacMini-DebugCompile-Trybot',
+ 'OSX-10.6-32-MacMini-ReleaseCompile-Trybot',
+ 'OSX-10.6-64-MacMini-DebugCompile-Trybot',
+ 'OSX-10.6-64-MacMini-ReleaseCompile-Trybot',
],
'num_cores': '8',
} for i in range(COMPILE_BUILDERS)
@@ -547,18 +546,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-32-MacMini-DebugCompile',
+ 'OSX-10.7-32-MacMini-ReleaseCompile',
+ 'OSX-10.7-64-MacMini-DebugCompile',
+ 'OSX-10.7-64-MacMini-ReleaseCompile',
+ 'iOS-6-32-iPhone-DebugCompile',
+ 'iOS-6-32-iPhone-ReleaseCompile',
+ 'OSX-10.7-32-MacMini-DebugCompile-Trybot',
+ 'OSX-10.7-32-MacMini-ReleaseCompile-Trybot',
+ 'OSX-10.7-64-MacMini-DebugCompile-Trybot',
+ 'OSX-10.7-64-MacMini-ReleaseCompile-Trybot',
+ 'iOS-6-32-iPhone-DebugCompile-Trybot',
+ 'iOS-6-32-iPhone-ReleaseCompile-Trybot',
],
'num_cores': '8',
} for i in range(COMPILE_BUILDERS)
@@ -567,14 +566,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-32-MacMini-DebugCompile',
+ 'OSX-10.8-32-MacMini-ReleaseCompile',
+ 'OSX-10.8-64-MacMini-DebugCompile',
+ 'OSX-10.8-64-MacMini-ReleaseCompile',
+ 'OSX-10.8-32-MacMini-DebugCompile-Trybot',
+ 'OSX-10.8-32-MacMini-ReleaseCompile-Trybot',
+ 'OSX-10.8-64-MacMini-DebugCompile-Trybot',
+ 'OSX-10.8-64-MacMini-ReleaseCompile-Trybot',
],
'num_cores': '8',
} for i in range(COMPILE_BUILDERS)
@@ -583,22 +582,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-32-Intel-DebugCompile',
+ 'Win-7-32-Intel-ReleaseCompile',
+ 'Win-7-64-Intel-DebugCompile',
+ 'Win-7-64-Intel-ReleaseCompile',
+ 'Win-7-32-Intel-ANGLE-DebugCompile',
+ 'Win-7-32-Intel-ANGLE-ReleaseCompile',
+ 'Win-7-32-Intel-DirectWrite-DebugCompile',
+ 'Win-7-32-Intel-DirectWrite-ReleaseCompile',
+ 'Win-7-32-Intel-DebugCompile-Trybot',
+ 'Win-7-32-Intel-ReleaseCompile-Trybot',
+ 'Win-7-64-Intel-DebugCompile-Trybot',
+ 'Win-7-64-Intel-ReleaseCompile-Trybot',
+ 'Win-7-32-Intel-ANGLE-DebugCompile-Trybot',
+ 'Win-7-32-Intel-ANGLE-ReleaseCompile-Trybot',
+ 'Win-7-32-Intel-DirectWrite-DebugCompile-Trybot',
+ 'Win-7-32-Intel-DirectWrite-ReleaseCompile-Trybot',
],
'num_cores': '8',
} for i in range(COMPILE_BUILDERS)
« master/skia_master_scripts/utils.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