master/slaves.cfg - Issue 13861012: Change builder names

Side by Side 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 unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 # -- python --	1 # -- python --

2 # ex: set syntax=python:	2 # ex: set syntax=python:

3	3

4 # Copyright (c) 2011 The Chromium Authors. All rights reserved.	4 # Copyright (c) 2011 The Chromium Authors. All rights reserved.

5 # Use of this source code is governed by a BSD-style license that can be	5 # Use of this source code is governed by a BSD-style license that can be

6 # found in the LICENSE file.	6 # found in the LICENSE file.

7	7

8 # See master.experimental/slaves.cfg for documentation.	8 # See master.experimental/slaves.cfg for documentation.

9	9

10	10

11 INTEGER_WIDTH = 3	11 INTEGER_WIDTH = 3

12 CONCURRENT_BUILDERS = 8	12 CONCURRENT_BUILDERS = 8

13 COMPILE_BUILDERS = 10	13 COMPILE_BUILDERS = 10

14 ANDROID_KEEPALIVE_CONDITION = ['python',	14 ANDROID_KEEPALIVE_CONDITION = ['python',

15 'buildbot/slave/skia_slave_scripts/android_verify_device.py', '--serial',	15 'buildbot/slave/skia_slave_scripts/android_verify_device.py', '--serial',

16 '%(serial)s']	16 '%(serial)s']

17 DEFAULT_ANDROID_SDK_ROOT = '/home/chrome-bot/android-sdk-linux'	17 DEFAULT_ANDROID_SDK_ROOT = '/home/chrome-bot/android-sdk-linux'

18 DEFAULT_NACL_SDK_ROOT = '/home/chrome-bot/nacl_sdk/pepper_25'	18 DEFAULT_NACL_SDK_ROOT = '/home/chrome-bot/nacl_sdk/pepper_25'

19 LINUX_COMPILE_BUILDERS = [	19 LINUX_COMPILE_BUILDERS = [

20 'Skia_Shuttle_Ubuntu12_ATI5770_Float_Compile_Debug_32',	20 'Ubuntu-12-ATI5770-32-DebugCompile',

21 'Skia_Shuttle_Ubuntu12_ATI5770_Float_Compile_Release_32',	21 'Ubuntu-12-ATI5770-32-ReleaseCompile',

22 'Skia_Shuttle_Ubuntu12_ATI5770_Float_Compile_Debug_64',	22 'Ubuntu-12-ATI5770-64-DebugCompile',

23 'Skia_Shuttle_Ubuntu12_ATI5770_Float_Compile_Release_64',	23 'Ubuntu-12-ATI5770-64-ReleaseCompile',

24 'Skia_NexusS_4-1_Float_Compile_Debug_32',	24 'Android-x-NexusS-32-DebugCompile',
	epoger 2013/04/19 16:25:44 To avoid all these "-x-"es , we could just roll Show quoted text On 2013/04/17 17:50:15, borenet wrote: > 2. There are 40 instances of "-x-", or 80 if you include the trybots. All of > them are OS versions for Android and ChromeOS. I think that not including a > version for these bots is the right thing to do, but I don't like the way it > looks. To avoid all these "-x-"es , we could just roll the OS version into the OS name field, like so: Ubuntu12, Android, ChromeOS, Win7, Win8 If you wanted to run on all Windows bots, I guess you could specify "all bots whose OS field matches Win", instead of "all bots whose OS field matches Win"... borenet* 2013/04/22 16:29:55 I think this is a good idea. We could also option Show quoted text On 2013/04/19 16:25:44, epoger wrote: > On 2013/04/17 17:50:15, borenet wrote: > > 2. There are 40 instances of "-x-", or 80 if you include the trybots. All of > > them are OS versions for Android and ChromeOS. I think that not including a > > version for these bots is the right thing to do, but I don't like the way it > > looks. > > To avoid all these "-x-"es , we could just roll the OS version into the OS > name field, like so: > > Ubuntu12, Android, ChromeOS, Win7, Win8 > > If you wanted to run on all Windows bots, I guess you could specify "all bots > whose OS field matches Win*", instead of "all bots whose OS field matches > Win"... I think this is a good idea. We could also optionally enforce that the OS name and version (if it exists) are separated with an underscore, eg. Ubuntu_12-xyz, so that it's still easily parseable into two fields.
25 'Skia_NexusS_4-1_Float_Compile_Release_32',	25 'Android-x-NexusS-32-ReleaseCompile',

26 'Skia_Xoom_4-1_Float_Compile_Debug_32',	26 'Android-x-Xoom-32-DebugCompile',

27 'Skia_Xoom_4-1_Float_Compile_Release_32',	27 'Android-x-Xoom-32-ReleaseCompile',

28 'Skia_GalaxyNexus_4-1_Float_Compile_Debug_32',	28 'Android-x-GalaxyNexus-32-DebugCompile',

29 'Skia_GalaxyNexus_4-1_Float_Compile_Release_32',	29 'Android-x-GalaxyNexus-32-ReleaseCompile',

30 'Skia_Nexus4_4-1_Float_Compile_Debug_32',	30 'Android-x-Nexus4-32-DebugCompile',

31 'Skia_Nexus4_4-1_Float_Compile_Release_32',	31 'Android-x-Nexus4-32-ReleaseCompile',

32 'Skia_Nexus7_4-1_Float_Compile_Debug_32',	32 'Android-x-Nexus7-32-DebugCompile',

33 'Skia_Nexus7_4-1_Float_Compile_Release_32',	33 'Android-x-Nexus7-32-ReleaseCompile',

34 'Skia_Nexus10_4-1_Float_Compile_Debug_32',	34 'Android-x-Nexus10-32-DebugCompile',

35 'Skia_Nexus10_4-1_Float_Compile_Release_32',	35 'Android-x-Nexus10-32-ReleaseCompile',

36 'Skia_RazrI_4-1_Float_Compile_Debug_32',	36 'Android-x-RazrI-32-DebugCompile',

37 'Skia_RazrI_4-1_Float_Compile_Release_32',	37 'Android-x-RazrI-32-ReleaseCompile',

38 'Skia_Linux_NoGPU_Compile_Debug_32',	38 'Ubuntu-12-NoGPU-32-DebugCompile',

39 'Skia_Linux_NoGPU_Compile_Release_32',	39 'Ubuntu-12-NoGPU-32-ReleaseCompile',

40 'Skia_ChromeOS_Alex_Compile_Debug_32',	40 'ChromeOS-x-Alex-32-DebugCompile',

41 'Skia_ChromeOS_Alex_Compile_Release_32',	41 'ChromeOS-x-Alex-32-ReleaseCompile',

42 'Skia_Shuttle_Ubuntu12_NaCl_Compile_Debug',	42 'Ubuntu-12-NaCl-32_64-DebugCompile',

43 'Skia_Shuttle_Ubuntu12_NaCl_Compile_Release',	43 'Ubuntu-12-NaCl-32_64-ReleaseCompile',

44 'Skia_Shuttle_Ubuntu12_ATI5770_Float_Compile_Debug_32_Trybot',	44 'Ubuntu-12-ATI5770-32-DebugCompile-Trybot',

45 'Skia_Shuttle_Ubuntu12_ATI5770_Float_Compile_Release_32_Trybot',	45 'Ubuntu-12-ATI5770-32-ReleaseCompile-Trybot',

46 'Skia_Shuttle_Ubuntu12_ATI5770_Float_Compile_Debug_64_Trybot',	46 'Ubuntu-12-ATI5770-64-DebugCompile-Trybot',

47 'Skia_Shuttle_Ubuntu12_ATI5770_Float_Compile_Release_64_Trybot',	47 'Ubuntu-12-ATI5770-64-ReleaseCompile-Trybot',

48 'Skia_NexusS_4-1_Float_Compile_Debug_32_Trybot',	48 'Android-x-NexusS-32-DebugCompile-Trybot',

49 'Skia_NexusS_4-1_Float_Compile_Release_32_Trybot',	49 'Android-x-NexusS-32-ReleaseCompile-Trybot',

50 'Skia_Xoom_4-1_Float_Compile_Debug_32_Trybot',	50 'Android-x-Xoom-32-DebugCompile-Trybot',

51 'Skia_Xoom_4-1_Float_Compile_Release_32_Trybot',	51 'Android-x-Xoom-32-ReleaseCompile-Trybot',

52 'Skia_GalaxyNexus_4-1_Float_Compile_Debug_32_Trybot',	52 'Android-x-GalaxyNexus-32-DebugCompile-Trybot',

53 'Skia_GalaxyNexus_4-1_Float_Compile_Release_32_Trybot',	53 'Android-x-GalaxyNexus-32-ReleaseCompile-Trybot',

54 'Skia_Nexus4_4-1_Float_Compile_Debug_32_Trybot',	54 'Android-x-Nexus4-32-DebugCompile-Trybot',

55 'Skia_Nexus4_4-1_Float_Compile_Release_32_Trybot',	55 'Android-x-Nexus4-32-ReleaseCompile-Trybot',

56 'Skia_Nexus7_4-1_Float_Compile_Debug_32_Trybot',	56 'Android-x-Nexus7-32-DebugCompile-Trybot',

57 'Skia_Nexus7_4-1_Float_Compile_Release_32_Trybot',	57 'Android-x-Nexus7-32-ReleaseCompile-Trybot',

58 'Skia_Nexus10_4-1_Float_Compile_Debug_32_Trybot',	58 'Android-x-Nexus10-32-DebugCompile-Trybot',

59 'Skia_Nexus10_4-1_Float_Compile_Release_32_Trybot',	59 'Android-x-Nexus10-32-ReleaseCompile-Trybot',

60 'Skia_RazrI_4-1_Float_Compile_Debug_32_Trybot',	60 'Android-x-RazrI-32-DebugCompile-Trybot',

61 'Skia_RazrI_4-1_Float_Compile_Release_32_Trybot',	61 'Android-x-RazrI-32-ReleaseCompile-Trybot',

62 'Skia_Linux_NoGPU_Compile_Debug_32_Trybot',	62 'Ubuntu-12-NoGPU-32-DebugCompile-Trybot',
	epoger 2013/04/19 16:25:44 These NoGPU builders are bugging me. They are the These NoGPU builders are bugging me. They are the ONE case in which our compile bots seem to care about the GPU field. borenet 2013/04/22 16:29:55 Agreed. And in that case, it's a build configurat Show quoted text On 2013/04/19 16:25:44, epoger wrote: > These NoGPU builders are bugging me. They are the ONE case in which our compile > bots seem to care about the GPU field. Agreed. And in that case, it's a build configuration, NOT a hardware spec. I guess I'll put it in the GPU field, even though it's not an exact fit.
63 'Skia_Linux_NoGPU_Compile_Release_32_Trybot',	63 'Ubuntu-12-NoGPU-32-ReleaseCompile-Trybot',

64 'Skia_ChromeOS_Alex_Compile_Debug_32_Trybot',	64 'ChromeOS-x-Alex-32-DebugCompile-Trybot',

65 'Skia_ChromeOS_Alex_Compile_Release_32_Trybot',	65 'ChromeOS-x-Alex-32-ReleaseCompile-Trybot',

66 'Skia_Shuttle_Ubuntu12_NaCl_Compile_Debug_Trybot',	66 'Ubuntu-12-NaCl-32_64-DebugCompile-Trybot',

67 'Skia_Shuttle_Ubuntu12_NaCl_Compile_Release_Trybot',	67 'Ubuntu-12-NaCl-32_64-ReleaseCompile-Trybot',

68 ]	68 ]

69	69

70 def _Format(obj, dictionary):	70 def _Format(obj, dictionary):

71 """ Recursively apply the dictionary to any format strings in the requested	71 """ Recursively apply the dictionary to any format strings in the requested

72 object. Returns a copy and does not modify the original. """	72 object. Returns a copy and does not modify the original. """

73 if isinstance(obj, str):	73 if isinstance(obj, str):

74 return obj % dictionary	74 return obj % dictionary

75 if isinstance(obj, list):	75 if isinstance(obj, list):

76 return [_Format(item, dictionary) for item in obj]	76 return [_Format(item, dictionary) for item in obj]

77 if isinstance(obj, dict):	77 if isinstance(obj, dict):

(...skipping 24 matching lines...) Expand all Loading...
102 >>> print SelfReferenceFormat(d)['key3']	102 >>> print SelfReferenceFormat(d)['key3']

103 %(key1)s2_fail	103 %(key1)s2_fail

104 """	104 """

105 return _Format(dictionary, dictionary)	105 return _Format(dictionary, dictionary)

106	106

107 slaves = [SelfReferenceFormat(d) for d in [	107 slaves = [SelfReferenceFormat(d) for d in [

108 {	108 {

109 'master': 'Skia',	109 'master': 'Skia',

110 'hostname': 'skiabot-shuttle-ubuntu12-nexuss-001',	110 'hostname': 'skiabot-shuttle-ubuntu12-nexuss-001',

111 'builder': [	111 'builder': [

112 'Skia_NexusS_4-1_Float_Debug_32',	112 'Android-x-NexusS-32-Debug',

113 'Skia_NexusS_4-1_Float_Release_32',	113 'Android-x-NexusS-32-Release',

114 'Skia_NexusS_4-1_Float_Bench_32',	114 'Android-x-NexusS-32-Bench',

115 'Skia_NexusS_4-1_Float_Debug_32_Trybot',	115 'Android-x-NexusS-32-Debug-Trybot',

116 'Skia_NexusS_4-1_Float_Release_32_Trybot',	116 'Android-x-NexusS-32-Release-Trybot',

117 'Skia_NexusS_4-1_Float_Bench_32_Trybot',	117 'Android-x-NexusS-32-Bench-Trybot',

118 ],	118 ],

119 'serial': '3835BCDAEF6F00EC',	119 'serial': '3835BCDAEF6F00EC',

120 'num_cores': '2',	120 'num_cores': '2',

121 'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION],	121 'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION],

122 'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT,	122 'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT,

123 },	123 },

124 {	124 {

125 'master': 'Skia',	125 'master': 'Skia',

126 'hostname': 'skiabot-shuttle-ubuntu12-nexuss-002',	126 'hostname': 'skiabot-shuttle-ubuntu12-nexuss-002',

127 'builder': [	127 'builder': [

128 'Skia_NexusS_4-1_Float_Debug_32',	128 'Android-x-NexusS-32-Debug',

129 'Skia_NexusS_4-1_Float_Release_32',	129 'Android-x-NexusS-32-Release',

130 'Skia_NexusS_4-1_Float_Bench_32',	130 'Android-x-NexusS-32-Bench',

131 'Skia_NexusS_4-1_Float_Debug_32_Trybot',	131 'Android-x-NexusS-32-Debug-Trybot',

132 'Skia_NexusS_4-1_Float_Release_32_Trybot',	132 'Android-x-NexusS-32-Release-Trybot',

133 'Skia_NexusS_4-1_Float_Bench_32_Trybot',	133 'Android-x-NexusS-32-Bench-Trybot',

134 ],	134 ],

135 'serial': '3935B4F8CA4B00EC',	135 'serial': '3935B4F8CA4B00EC',

136 'num_cores': '2',	136 'num_cores': '2',

137 'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION],	137 'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION],

138 'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT,	138 'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT,

139 },	139 },

140 {	140 {

141 'master': 'Skia',	141 'master': 'Skia',

142 'hostname': 'skiabot-shuttle-ubuntu12-xoom-001',	142 'hostname': 'skiabot-shuttle-ubuntu12-xoom-001',

143 'builder': [	143 'builder': [

144 'Skia_Xoom_4-1_Float_Debug_32',	144 'Android-x-Xoom-32-Debug',

145 'Skia_Xoom_4-1_Float_Release_32',	145 'Android-x-Xoom-32-Release',

146 'Skia_Xoom_4-1_Float_Bench_32',	146 'Android-x-Xoom-32-Bench',

147 'Skia_Xoom_4-1_Float_Debug_32_Trybot',	147 'Android-x-Xoom-32-Debug-Trybot',

148 'Skia_Xoom_4-1_Float_Release_32_Trybot',	148 'Android-x-Xoom-32-Release-Trybot',

149 'Skia_Xoom_4-1_Float_Bench_32_Trybot',	149 'Android-x-Xoom-32-Bench-Trybot',

150 ],	150 ],

151 'serial': '1700618542c101d7',	151 'serial': '1700618542c101d7',

152 'num_cores': '2',	152 'num_cores': '2',

153 'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION],	153 'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION],

154 'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT,	154 'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT,

155 },	155 },

156 {	156 {

157 'master': 'Skia',	157 'master': 'Skia',

158 'hostname': 'skiabot-shuttle-ubuntu12-xoom-002',	158 'hostname': 'skiabot-shuttle-ubuntu12-xoom-002',

159 'builder': [	159 'builder': [

160 'Skia_Xoom_4-1_Float_Debug_32',	160 'Android-x-Xoom-32-Debug',

161 'Skia_Xoom_4-1_Float_Release_32',	161 'Android-x-Xoom-32-Release',

162 'Skia_Xoom_4-1_Float_Bench_32',	162 'Android-x-Xoom-32-Bench',

163 'Skia_Xoom_4-1_Float_Debug_32_Trybot',	163 'Android-x-Xoom-32-Debug-Trybot',

164 'Skia_Xoom_4-1_Float_Release_32_Trybot',	164 'Android-x-Xoom-32-Release-Trybot',

165 'Skia_Xoom_4-1_Float_Bench_32_Trybot',	165 'Android-x-Xoom-32-Bench-Trybot',

166 ],	166 ],

167 'serial': '027c104942212397',	167 'serial': '027c104942212397',

168 'num_cores': '2',	168 'num_cores': '2',

169 'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION],	169 'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION],

170 'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT,	170 'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT,

171 },	171 },

172 {	172 {

173 'master': 'Skia',	173 'master': 'Skia',

174 'hostname': 'skiabot-shuttle-ubuntu12-xoom-003',	174 'hostname': 'skiabot-shuttle-ubuntu12-xoom-003',

175 'builder': [	175 'builder': [

176 'Skia_Xoom_4-1_Float_Debug_32',	176 'Android-x-Xoom-32-Debug',

177 'Skia_Xoom_4-1_Float_Release_32',	177 'Android-x-Xoom-32-Release',

178 'Skia_Xoom_4-1_Float_Bench_32',	178 'Android-x-Xoom-32-Bench',

179 'Skia_Xoom_4-1_Float_Debug_32_Trybot',	179 'Android-x-Xoom-32-Debug-Trybot',

180 'Skia_Xoom_4-1_Float_Release_32_Trybot',	180 'Android-x-Xoom-32-Release-Trybot',

181 'Skia_Xoom_4-1_Float_Bench_32_Trybot',	181 'Android-x-Xoom-32-Bench-Trybot',

182 ],	182 ],

183 'serial': '1700618443a00497',	183 'serial': '1700618443a00497',

184 'num_cores': '2',	184 'num_cores': '2',

185 'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION],	185 'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION],

186 'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT,	186 'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT,

187 },	187 },

188 {	188 {

189 'master': 'Skia',	189 'master': 'Skia',

190 'hostname': 'skiabot-shuttle-ubuntu12-galaxynexus-001',	190 'hostname': 'skiabot-shuttle-ubuntu12-galaxynexus-001',

191 'builder': [	191 'builder': [

192 'Skia_GalaxyNexus_4-1_Float_Debug_32',	192 'Android-x-GalaxyNexus-32-Debug',

193 'Skia_GalaxyNexus_4-1_Float_Release_32',	193 'Android-x-GalaxyNexus-32-Release',

194 'Skia_GalaxyNexus_4-1_Float_Bench_32',	194 'Android-x-GalaxyNexus-32-Bench',

195 'Skia_GalaxyNexus_4-1_Float_Debug_32_Trybot',	195 'Android-x-GalaxyNexus-32-Debug-Trybot',

196 'Skia_GalaxyNexus_4-1_Float_Release_32_Trybot',	196 'Android-x-GalaxyNexus-32-Release-Trybot',

197 'Skia_GalaxyNexus_4-1_Float_Bench_32_Trybot',	197 'Android-x-GalaxyNexus-32-Bench-Trybot',

198 ],	198 ],

199 'serial': '0149A97C1601B015',	199 'serial': '0149A97C1601B015',

200 'num_cores': '2',	200 'num_cores': '2',

201 'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION],	201 'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION],

202 'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT,	202 'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT,

203 },	203 },

204 {	204 {

205 'master': 'Skia',	205 'master': 'Skia',

206 'hostname': 'skiabot-shuttle-ubuntu12-nexus4-001',	206 'hostname': 'skiabot-shuttle-ubuntu12-nexus4-001',

207 'builder': [	207 'builder': [

208 'Skia_Nexus4_4-1_Float_Debug_32',	208 'Android-x-Nexus4-32-Debug',

209 'Skia_Nexus4_4-1_Float_Release_32',	209 'Android-x-Nexus4-32-Release',

210 'Skia_Nexus4_4-1_Float_Bench_32',	210 'Android-x-Nexus4-32-Bench',

211 'Skia_Nexus4_4-1_Float_Debug_32_Trybot',	211 'Android-x-Nexus4-32-Debug-Trybot',

212 'Skia_Nexus4_4-1_Float_Release_32_Trybot',	212 'Android-x-Nexus4-32-Release-Trybot',

213 'Skia_Nexus4_4-1_Float_Bench_32_Trybot',	213 'Android-x-Nexus4-32-Bench-Trybot',

214 ],	214 ],

215 'serial': '0012746f51cea6b9',	215 'serial': '0012746f51cea6b9',

216 'num_cores': '4',	216 'num_cores': '4',

217 'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION],	217 'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION],

218 'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT,	218 'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT,

219 },	219 },

220 {	220 {

221 'master': 'Skia',	221 'master': 'Skia',

222 'hostname': 'skiabot-shuttle-ubuntu12-nexus7-001',	222 'hostname': 'skiabot-shuttle-ubuntu12-nexus7-001',

223 'builder': [	223 'builder': [

224 'Skia_Nexus7_4-1_Float_Debug_32',	224 'Android-x-Nexus7-32-Debug',

225 'Skia_Nexus7_4-1_Float_Release_32',	225 'Android-x-Nexus7-32-Release',

226 'Skia_Nexus7_4-1_Float_Bench_32',	226 'Android-x-Nexus7-32-Bench',

227 'Skia_Nexus7_4-1_Float_Debug_32_Trybot',	227 'Android-x-Nexus7-32-Debug-Trybot',

228 'Skia_Nexus7_4-1_Float_Release_32_Trybot',	228 'Android-x-Nexus7-32-Release-Trybot',

229 'Skia_Nexus7_4-1_Float_Bench_32_Trybot',	229 'Android-x-Nexus7-32-Bench-Trybot',

230 ],	230 ],

231 'serial': '015d210a13480604',	231 'serial': '015d210a13480604',

232 'num_cores': '4',	232 'num_cores': '4',

233 'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION],	233 'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION],

234 'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT,	234 'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT,

235 },	235 },

236 {	236 {

237 'master': 'Skia',	237 'master': 'Skia',

238 'hostname': 'skiabot-shuttle-ubuntu12-nexus7-002',	238 'hostname': 'skiabot-shuttle-ubuntu12-nexus7-002',

239 'builder': [	239 'builder': [

240 'Skia_Nexus7_4-1_Float_Debug_32',	240 'Android-x-Nexus7-32-Debug',

241 'Skia_Nexus7_4-1_Float_Release_32',	241 'Android-x-Nexus7-32-Release',

242 'Skia_Nexus7_4-1_Float_Bench_32',	242 'Android-x-Nexus7-32-Bench',

243 'Skia_Nexus7_4-1_Float_Debug_32_Trybot',	243 'Android-x-Nexus7-32-Debug-Trybot',

244 'Skia_Nexus7_4-1_Float_Release_32_Trybot',	244 'Android-x-Nexus7-32-Release-Trybot',

245 'Skia_Nexus7_4-1_Float_Bench_32_Trybot',	245 'Android-x-Nexus7-32-Bench-Trybot',

246 ],	246 ],

247 'serial': '015d18848c280217',	247 'serial': '015d18848c280217',

248 'num_cores': '4',	248 'num_cores': '4',

249 'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION],	249 'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION],

250 'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT,	250 'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT,

251 },	251 },

252 {	252 {

253 'master': 'Skia',	253 'master': 'Skia',

254 'hostname': 'skiabot-shuttle-ubuntu12-nexus7-003',	254 'hostname': 'skiabot-shuttle-ubuntu12-nexus7-003',

255 'builder': [	255 'builder': [

256 'Skia_Nexus7_4-1_Float_Debug_32',	256 'Android-x-Nexus7-32-Debug',

257 'Skia_Nexus7_4-1_Float_Release_32',	257 'Android-x-Nexus7-32-Release',

258 'Skia_Nexus7_4-1_Float_Bench_32',	258 'Android-x-Nexus7-32-Bench',

259 'Skia_Nexus7_4-1_Float_Debug_32_Trybot',	259 'Android-x-Nexus7-32-Debug-Trybot',

260 'Skia_Nexus7_4-1_Float_Release_32_Trybot',	260 'Android-x-Nexus7-32-Release-Trybot',

261 'Skia_Nexus7_4-1_Float_Bench_32_Trybot',	261 'Android-x-Nexus7-32-Bench-Trybot',

262 ],	262 ],

263 'serial': '015d16897c401e17',	263 'serial': '015d16897c401e17',

264 'num_cores': '4',	264 'num_cores': '4',

265 'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION],	265 'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION],

266 'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT,	266 'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT,

267 },	267 },

268 {	268 {

269 'master': 'Skia',	269 'master': 'Skia',

270 'hostname': 'skiabot-shuttle-ubuntu12-nexus10-001',	270 'hostname': 'skiabot-shuttle-ubuntu12-nexus10-001',

271 'builder': [	271 'builder': [

272 'Skia_Nexus10_4-1_Float_Debug_32',	272 'Android-x-Nexus10-32-Debug',

273 'Skia_Nexus10_4-1_Float_Release_32',	273 'Android-x-Nexus10-32-Release',

274 'Skia_Nexus10_4-1_Float_Bench_32',	274 'Android-x-Nexus10-32-Bench',

275 'Skia_Nexus10_4-1_Float_Debug_32_Trybot',	275 'Android-x-Nexus10-32-Debug-Trybot',

276 'Skia_Nexus10_4-1_Float_Release_32_Trybot',	276 'Android-x-Nexus10-32-Release-Trybot',

277 'Skia_Nexus10_4-1_Float_Bench_32_Trybot',	277 'Android-x-Nexus10-32-Bench-Trybot',

278 ],	278 ],

279 'serial': 'R32C801B5LH',	279 'serial': 'R32C801B5LH',

280 'num_cores': '2',	280 'num_cores': '2',

281 'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION],	281 'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION],

282 'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT,	282 'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT,

283 },	283 },

284 {	284 {

285 'master': 'Skia',	285 'master': 'Skia',

286 'hostname': 'skiabot-shuttle-ubuntu12-nexus10-002',	286 'hostname': 'skiabot-shuttle-ubuntu12-nexus10-002',

287 'builder': [	287 'builder': [

288 'Skia_Nexus10_4-1_Float_Debug_32',	288 'Android-x-Nexus10-32-Debug',

289 'Skia_Nexus10_4-1_Float_Release_32',	289 'Android-x-Nexus10-32-Release',

290 'Skia_Nexus10_4-1_Float_Bench_32',	290 'Android-x-Nexus10-32-Bench',

291 'Skia_Nexus10_4-1_Float_Debug_32_Trybot',	291 'Android-x-Nexus10-32-Debug-Trybot',

292 'Skia_Nexus10_4-1_Float_Release_32_Trybot',	292 'Android-x-Nexus10-32-Release-Trybot',

293 'Skia_Nexus10_4-1_Float_Bench_32_Trybot',	293 'Android-x-Nexus10-32-Bench-Trybot',

294 ],	294 ],

295 'serial': 'R32C801B86F',	295 'serial': 'R32C801B86F',

296 'num_cores': '2',	296 'num_cores': '2',

297 'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION],	297 'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION],

298 'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT,	298 'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT,

299 },	299 },

300 {	300 {

301 'master': 'Skia',	301 'master': 'Skia',

302 'hostname': 'skiabot-shuttle-ubuntu12-nexus10-003',	302 'hostname': 'skiabot-shuttle-ubuntu12-nexus10-003',

303 'builder': [	303 'builder': [

304 'Skia_Nexus10_4-1_Float_Debug_32',	304 'Android-x-Nexus10-32-Debug',

305 'Skia_Nexus10_4-1_Float_Release_32',	305 'Android-x-Nexus10-32-Release',

306 'Skia_Nexus10_4-1_Float_Bench_32',	306 'Android-x-Nexus10-32-Bench',

307 'Skia_Nexus10_4-1_Float_Debug_32_Trybot',	307 'Android-x-Nexus10-32-Debug-Trybot',

308 'Skia_Nexus10_4-1_Float_Release_32_Trybot',	308 'Android-x-Nexus10-32-Release-Trybot',

309 'Skia_Nexus10_4-1_Float_Bench_32_Trybot',	309 'Android-x-Nexus10-32-Bench-Trybot',

310 ],	310 ],

311 'serial': 'R32CB017X2L',	311 'serial': 'R32CB017X2L',

312 'num_cores': '2',	312 'num_cores': '2',

313 'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION],	313 'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION],

314 'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT,	314 'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT,

315 },	315 },

316 {	316 {

317 'master': 'Skia',	317 'master': 'Skia',

318 'hostname': 'skiabot-shuttle-ubuntu12-razri-001',	318 'hostname': 'skiabot-shuttle-ubuntu12-razri-001',

319 'builder': [	319 'builder': [

320 'Skia_RazrI_4-1_Float_Debug_32',	320 'Android-x-RazrI-32-Debug',

321 'Skia_RazrI_4-1_Float_Release_32',	321 'Android-x-RazrI-32-Release',

322 'Skia_RazrI_4-1_Float_Bench_32',	322 'Android-x-RazrI-32-Bench',

323 'Skia_RazrI_4-1_Float_Debug_32_Trybot',	323 'Android-x-RazrI-32-Debug-Trybot',

324 'Skia_RazrI_4-1_Float_Release_32_Trybot',	324 'Android-x-RazrI-32-Release-Trybot',

325 'Skia_RazrI_4-1_Float_Bench_32_Trybot',	325 'Android-x-RazrI-32-Bench-Trybot',

326 ],	326 ],

327 'serial': 'TA23702Z9Y',	327 'serial': 'TA23702Z9Y',

328 'num_cores': '1',	328 'num_cores': '1',

329 'has_root': False,	329 'has_root': False,

330 'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION],	330 'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION],

331 'android_sdk_root': '/usr/local/google/android-sdk-linux',	331 'android_sdk_root': '/usr/local/google/android-sdk-linux',

332 },	332 },

333 {	333 {

334 'master': 'Skia',	334 'master': 'Skia',

335 'hostname': 'skiabot-shuttle-ubuntu12-001',	335 'hostname': 'skiabot-shuttle-ubuntu12-001',

336 'builder': [	336 'builder': [

337 'Skia_Linux_NoGPU_Debug_32',	337 'Ubuntu-12-NoGPU-32-Debug',

338 'Skia_Linux_NoGPU_Debug_32_Trybot',	338 'Ubuntu-12-NoGPU-32-Debug-Trybot',

339 ],	339 ],

340 'num_cores': '8',	340 'num_cores': '8',

341 },	341 },

342 {	342 {

343 'master': 'Skia',	343 'master': 'Skia',

344 'hostname': 'skiabot-shuttle-ubuntu12-002',	344 'hostname': 'skiabot-shuttle-ubuntu12-002',

345 'builder': [	345 'builder': [

346 'Skia_ChromeOS_Alex_Debug_32',	346 'ChromeOS-x-Alex-32-Debug',

347 'Skia_ChromeOS_Alex_Release_32',	347 'ChromeOS-x-Alex-32-Release',

348 'Skia_ChromeOS_Alex_Bench_32',	348 'ChromeOS-x-Alex-32-Bench',

349 'Skia_ChromeOS_Alex_Debug_32_Trybot',	349 'ChromeOS-x-Alex-32-Debug-Trybot',

350 'Skia_ChromeOS_Alex_Release_32_Trybot',	350 'ChromeOS-x-Alex-32-Release-Trybot',

351 'Skia_ChromeOS_Alex_Bench_32_Trybot',	351 'ChromeOS-x-Alex-32-Bench-Trybot',

352

353 ],	352 ],

354 'ssh_host': '192.168.1.134',	353 'ssh_host': '192.168.1.134',

355 'ssh_port': '22',	354 'ssh_port': '22',

356 },	355 },

357 {	356 {

358 'master': 'Skia',	357 'master': 'Skia',

359 'hostname': 'skiabot-shuttle-ubuntu12-ati5770-001',	358 'hostname': 'skiabot-shuttle-ubuntu12-ati5770-001',

360 'builder': [	359 'builder': [

361 'Skia_Shuttle_Ubuntu12_ATI5770_Float_Debug_32',	360 'Ubuntu-12-ATI5770-32-Debug',

362 'Skia_Shuttle_Ubuntu12_ATI5770_Float_Release_32',	361 'Ubuntu-12-ATI5770-32-Release',

363 'Skia_Shuttle_Ubuntu12_ATI5770_Float_Bench_32',	362 'Ubuntu-12-ATI5770-32-Bench',
	epoger 2013/04/19 16:25:44 I think it would be better for the 32/64 field to I think it would be better for the 32/64 field to be after the Debug/Release field, because when there are numbers in two adjacent fields it's harder for a human to parse the builder name. In other words, if someone reads these two names out loud: Ubuntu-12-ATI5770-32-Debug Ubuntu-12-ATI5770-Debug-32 I think the second one is easier to understand. borenet 2013/04/22 16:29:55 Done. However, it comes before extra_config, so Show quoted text On 2013/04/19 16:25:44, epoger wrote: > I think it would be better for the 32/64 field to be after the Debug/Release > field, because when there are numbers in two adjacent fields it's harder for a > human to parse the builder name. > > In other words, if someone reads these two names out loud: > Ubuntu-12-ATI5770-32-Debug > Ubuntu-12-ATI5770-Debug-32 > I think the second one is easier to understand. Done. However, it comes before extra_config, so that that field is always last.
364 'Skia_Shuttle_Ubuntu12_ATI5770_Float_Debug_64',	363 'Ubuntu-12-ATI5770-64-Debug',

365 'Skia_Shuttle_Ubuntu12_ATI5770_Float_Release_64',	364 'Ubuntu-12-ATI5770-64-Release',

366 'Skia_Shuttle_Ubuntu12_ATI5770_Float_Bench_64',	365 'Ubuntu-12-ATI5770-64-Bench',

367 'Skia_Shuttle_Ubuntu12_ATI5770_Float_Debug_32_Trybot',	366 'Ubuntu-12-ATI5770-32-Debug-Trybot',

368 'Skia_Shuttle_Ubuntu12_ATI5770_Float_Release_32_Trybot',	367 'Ubuntu-12-ATI5770-32-Release-Trybot',

369 'Skia_Shuttle_Ubuntu12_ATI5770_Float_Bench_32_Trybot',	368 'Ubuntu-12-ATI5770-32-Bench-Trybot',

370 'Skia_Shuttle_Ubuntu12_ATI5770_Float_Debug_64_Trybot',	369 'Ubuntu-12-ATI5770-64-Debug-Trybot',

371 'Skia_Shuttle_Ubuntu12_ATI5770_Float_Release_64_Trybot',	370 'Ubuntu-12-ATI5770-64-Release-Trybot',

372 'Skia_Shuttle_Ubuntu12_ATI5770_Float_Bench_64_Trybot',	371 'Ubuntu-12-ATI5770-64-Bench-Trybot',

373 ],	372 ],

374 'num_cores': '8',	373 'num_cores': '8',

375 },	374 },

376 ] + [	375 ] + [

377 {	376 {

378 'master': 'Skia',	377 'master': 'Skia',

379 'hostname': 'skiabot-macmini-10_6-%s' % ('%d' % i).zfill(INTEGER_WIDTH),	378 'hostname': 'skiabot-macmini-10_6-%s' % ('%d' % i).zfill(INTEGER_WIDTH),

380 'builder': [	379 'builder': [

381 'Skia_Mac_Float_Debug_32',	380 'OSX-10_6-MacMini-32-Debug',

382 'Skia_Mac_Float_Release_32',	381 'OSX-10_6-MacMini-32-Release',

383 'Skia_Mac_Float_Debug_64',	382 'OSX-10_6-MacMini-64-Debug',

384 'Skia_Mac_Float_Release_64',	383 'OSX-10_6-MacMini-64-Release',

385 'Skia_Mac_Float_Debug_32_Trybot',	384 'OSX-10_6-MacMini-32-Debug-Trybot',

386 'Skia_Mac_Float_Release_32_Trybot',	385 'OSX-10_6-MacMini-32-Release-Trybot',

387 'Skia_Mac_Float_Debug_64_Trybot',	386 'OSX-10_6-MacMini-64-Debug-Trybot',

388 'Skia_Mac_Float_Release_64_Trybot',	387 'OSX-10_6-MacMini-64-Release-Trybot',

389 ],	388 ],

390 'num_cores': '4',	389 'num_cores': '4',

391 } for i in range(CONCURRENT_BUILDERS)	390 } for i in range(CONCURRENT_BUILDERS)

392 ] + [	391 ] + [

393 {	392 {

394 'master': 'Skia',	393 'master': 'Skia',

395 'hostname': 'skiabot-macmini-10_7-%s' % ('%d' % i).zfill(INTEGER_WIDTH),	394 'hostname': 'skiabot-macmini-10_7-%s' % ('%d' % i).zfill(INTEGER_WIDTH),

396 'builder': [	395 'builder': [

397 'Skia_MacMiniLion_Float_Debug_32',	396 'OSX-10_7-MacMini-32-Debug',
	epoger 2013/04/19 16:25:44 I think we should try to allow '.' in the version I think we should try to allow '.' in the version field (and thus, I guess, in any field). It's natural for this character to appear within a version number, and it's not clear to me what would go wrong if we allowed its use. borenet 2013/04/22 16:29:55 Done. Show quoted text On 2013/04/19 16:25:44, epoger wrote: > I think we should try to allow '.' in the version field (and thus, I guess, in > any field). It's natural for this character to appear within a version number, > and it's not clear to me what would go wrong if we allowed its use. Done.
398 'Skia_MacMiniLion_Float_Release_32',	397 'OSX-10_7-MacMini-32-Release',

399 'Skia_MacMiniLion_Float_Debug_64',	398 'OSX-10_7-MacMini-64-Debug',
	epoger 2013/04/19 16:25:44 I still prefer "Mac" to "OSX". I think it's clear I still prefer "Mac" to "OSX". I think it's clearer, and besides, it seems to me that the "X" bit is already covered by version "10." Ultimately, I would suggest names like this: Mac10.7-MacMini-32-Debug borenet* 2013/04/22 16:29:55 Done. Show quoted text On 2013/04/19 16:25:44, epoger wrote: > I still prefer "Mac" to "OSX". I think it's clearer, and besides, it seems to > me that the "X" bit is already covered by version "10.*" > > Ultimately, I would suggest names like this: > > Mac10.7-MacMini-32-Debug Done.
400 'Skia_MacMiniLion_Float_Release_64',	399 'OSX-10_7-MacMini-64-Release',

401 'Skia_MacMiniLion_Float_Debug_32_Trybot',	400 'OSX-10_7-MacMini-32-Debug-Trybot',

402 'Skia_MacMiniLion_Float_Release_32_Trybot',	401 'OSX-10_7-MacMini-32-Release-Trybot',

403 'Skia_MacMiniLion_Float_Debug_64_Trybot',	402 'OSX-10_7-MacMini-64-Debug-Trybot',

404 'Skia_MacMiniLion_Float_Release_64_Trybot',	403 'OSX-10_7-MacMini-64-Release-Trybot',

405 ],	404 ],

406 'num_cores': '4',	405 'num_cores': '4',

407 } for i in range(CONCURRENT_BUILDERS)	406 } for i in range(CONCURRENT_BUILDERS)

408 ] + [	407 ] + [

409 {	408 {

410 'master': 'Skia',	409 'master': 'Skia',

411 'hostname': 'skiabot-macmini-10_8-%s' % ('%d' % i).zfill(INTEGER_WIDTH),	410 'hostname': 'skiabot-macmini-10_8-%s' % ('%d' % i).zfill(INTEGER_WIDTH),

412 'builder': [	411 'builder': [

413 'Skia_MacMini_10_8_Float_Debug_32',	412 'OSX-10_8-MacMini-32-Debug',

414 'Skia_MacMini_10_8_Float_Release_32',	413 'OSX-10_8-MacMini-32-Release',

415 'Skia_MacMini_10_8_Float_Debug_64',	414 'OSX-10_8-MacMini-64-Debug',

416 'Skia_MacMini_10_8_Float_Release_64',	415 'OSX-10_8-MacMini-64-Release',

417 'Skia_MacMini_10_8_Float_Debug_32_Trybot',	416 'OSX-10_8-MacMini-32-Debug-Trybot',

418 'Skia_MacMini_10_8_Float_Release_32_Trybot',	417 'OSX-10_8-MacMini-32-Release-Trybot',

419 'Skia_MacMini_10_8_Float_Debug_64_Trybot',	418 'OSX-10_8-MacMini-64-Debug-Trybot',

420 'Skia_MacMini_10_8_Float_Release_64_Trybot',	419 'OSX-10_8-MacMini-64-Release-Trybot',

421 ],	420 ],

422 'num_cores': '4',	421 'num_cores': '4',

423 } for i in range(CONCURRENT_BUILDERS)	422 } for i in range(CONCURRENT_BUILDERS)

424 ] + [	423 ] + [

425 {	424 {

426 'master': 'Skia',	425 'master': 'Skia',

427 'hostname': 'skiabot-shuttle-win7-intel-%s' % ('%d' % i).zfill(INTEGER_WIDTH ),	426 'hostname': 'skiabot-shuttle-win7-intel-%s' % ('%d' % i).zfill(INTEGER_WIDTH ),

428 'builder': [	427 'builder': [

429 'Skia_Shuttle_Win7_Intel_Float_Debug_32',	428 'Win-7-Intel-32-Debug',

430 'Skia_Shuttle_Win7_Intel_Float_Release_32',	429 'Win-7-Intel-32-Release',

431 'Skia_Shuttle_Win7_Intel_Float_Debug_64',	430 'Win-7-Intel-64-Debug',

432 'Skia_Shuttle_Win7_Intel_Float_Release_64',	431 'Win-7-Intel-64-Release',

433 'Skia_Shuttle_Win7_Intel_Float_Debug_32_Trybot',	432 'Win-7-Intel-32-Debug-Trybot',

434 'Skia_Shuttle_Win7_Intel_Float_Release_32_Trybot',	433 'Win-7-Intel-32-Release-Trybot',

435 'Skia_Shuttle_Win7_Intel_Float_Debug_64_Trybot',	434 'Win-7-Intel-64-Debug-Trybot',

436 'Skia_Shuttle_Win7_Intel_Float_Release_64_Trybot',	435 'Win-7-Intel-64-Release-Trybot',

437 ],	436 ],

438 'num_cores': '8',	437 'num_cores': '8',

439 } for i in range(CONCURRENT_BUILDERS)	438 } for i in range(CONCURRENT_BUILDERS)

440 ] + [	439 ] + [

441 {	440 {

442 'master': 'Skia',	441 'master': 'Skia',

443 'hostname': 'skiabot-shuttle-win7-intel-special-%s' % ('%d' % i).zfill(INTEG ER_WIDTH),	442 'hostname': 'skiabot-shuttle-win7-intel-special-%s' % ('%d' % i).zfill(INTEG ER_WIDTH),

444 'builder': [	443 'builder': [

445 'Skia_Shuttle_Win7_Intel_Float_ANGLE_Debug_32',	444 'Win-7-Intel-32-Debug-ANGLE',

446 'Skia_Shuttle_Win7_Intel_Float_ANGLE_Release_32',	445 'Win-7-Intel-32-Release-ANGLE',

447 'Skia_Shuttle_Win7_Intel_Float_DirectWrite_Debug_32',	446 'Win-7-Intel-32-Debug-DirectWrite',

448 'Skia_Shuttle_Win7_Intel_Float_DirectWrite_Release_32',	447 'Win-7-Intel-32-Release-DirectWrite',

449 'Skia_Shuttle_Win7_Intel_Float_ANGLE_Debug_32_Trybot',	448 'Win-7-Intel-32-Debug-ANGLE-Trybot',

450 'Skia_Shuttle_Win7_Intel_Float_ANGLE_Release_32_Trybot',	449 'Win-7-Intel-32-Release-ANGLE-Trybot',

451 'Skia_Shuttle_Win7_Intel_Float_DirectWrite_Debug_32_Trybot',	450 'Win-7-Intel-32-Debug-DirectWrite-Trybot',

452 'Skia_Shuttle_Win7_Intel_Float_DirectWrite_Release_32_Trybot',	451 'Win-7-Intel-32-Release-DirectWrite-Trybot',

453 ],	452 ],

454 'num_cores': '8',	453 'num_cores': '8',

455 } for i in range(CONCURRENT_BUILDERS)	454 } for i in range(CONCURRENT_BUILDERS)

456 ] + [	455 ] + [

457 {	456 {

458 'master': 'Skia',	457 'master': 'Skia',

459 'hostname': 'skiabot-macmini-10_6-bench',	458 'hostname': 'skiabot-macmini-10_6-bench',

460 'builder': [	459 'builder': [

461 'Skia_Mac_Float_Bench_32',	460 'OSX-10_6-MacMini-32-Bench',

462 'Skia_Mac_Float_Bench_64',	461 'OSX-10_6-MacMini-64-Bench',

463 'Skia_Mac_Float_Bench_32_Trybot',	462 'OSX-10_6-MacMini-32-Bench-Trybot',

464 'Skia_Mac_Float_Bench_64_Trybot',	463 'OSX-10_6-MacMini-64-Bench-Trybot',

465 ],	464 ],

466 },	465 },

467 {	466 {

468 'master': 'Skia',	467 'master': 'Skia',

469 'hostname': 'skiabot-macmini-10_7-bench',	468 'hostname': 'skiabot-macmini-10_7-bench',

470 'builder': [	469 'builder': [

471 'Skia_MacMiniLion_Float_Bench_32',	470 'OSX-10_7-MacMini-32-Bench',

472 'Skia_MacMiniLion_Float_Bench_64',	471 'OSX-10_7-MacMini-64-Bench',

473 'Skia_MacMiniLion_Float_Bench_32_Trybot',	472 'OSX-10_7-MacMini-32-Bench-Trybot',

474 'Skia_MacMiniLion_Float_Bench_64_Trybot',	473 'OSX-10_7-MacMini-64-Bench-Trybot',

475 ],	474 ],

476 },	475 },

477 {	476 {

478 'master': 'Skia',	477 'master': 'Skia',

479 'hostname': 'skiabot-macmini-10_8-bench',	478 'hostname': 'skiabot-macmini-10_8-bench',

480 'builder': [	479 'builder': [

481 'Skia_MacMini_10_8_Float_Bench_32',	480 'OSX-10_8-MacMini-32-Bench',

482 'Skia_MacMini_10_8_Float_Bench_64',	481 'OSX-10_8-MacMini-64-Bench',

483 'Skia_MacMini_10_8_Float_Bench_32_Trybot',	482 'OSX-10_8-MacMini-32-Bench-Trybot',

484 'Skia_MacMini_10_8_Float_Bench_64_Trybot',	483 'OSX-10_8-MacMini-64-Bench-Trybot',

485 ],	484 ],

486 },	485 },

487 {	486 {

488 'master': 'Skia',	487 'master': 'Skia',

489 'hostname': 'skiabot-shuttle-win7-intel-bench',	488 'hostname': 'skiabot-shuttle-win7-intel-bench',

490 'builder': [	489 'builder': [

491 'Skia_Shuttle_Win7_Intel_Float_Bench_64',	490 'Win-7-Intel-32-Bench',

492 'Skia_Shuttle_Win7_Intel_Float_Bench_32',	491 'Win-7-Intel-64-Bench',

493 'Skia_Shuttle_Win7_Intel_Float_ANGLE_Bench_32',	492 'Win-7-Intel-32-Bench-ANGLE',

494 'Skia_Shuttle_Win7_Intel_Float_DirectWrite_Bench_32',	493 'Win-7-Intel-32-Bench-DirectWrite',

495 'Skia_Shuttle_Win7_Intel_Float_Bench_64_Trybot',	494 'Win-7-Intel-32-Bench-Trybot',

496 'Skia_Shuttle_Win7_Intel_Float_Bench_32_Trybot',	495 'Win-7-Intel-64-Bench-Trybot',

497 'Skia_Shuttle_Win7_Intel_Float_ANGLE_Bench_32_Trybot',	496 'Win-7-Intel-32-Bench-ANGLE-Trybot',

498 'Skia_Shuttle_Win7_Intel_Float_DirectWrite_Bench_32_Trybot',	497 'Win-7-Intel-32-Bench-DirectWrite-Trybot',

499 ],	498 ],

500 },	499 },

501 {	500 {

502 'master': 'Skia',	501 'master': 'Skia',

503 'hostname': 'skia-housekeeping-slave-a',	502 'hostname': 'skia-housekeeping-slave-a',

504 'builder': [	503 'builder': [

505 'Skia_PerCommit_House_Keeping',	504 'PerCommit-Housekeeping',

506 'Skia_Periodic_House_Keeping',	505 'Periodic-Housekeeping',

507 'Skia_PerCommit_House_Keeping_Trybot',	506 'PerCommit-Housekeeping-Trybot',

508 'Skia_Periodic_House_Keeping_Trybot',	507 'Periodic-Housekeeping-Trybot',

509 ],	508 ],

510 },	509 },

511 {	510 {

512 'master': 'Skia',	511 'master': 'Skia',

513 'hostname': 'skia-housekeeping-slave-b',	512 'hostname': 'skia-housekeeping-slave-b',

514 'builder': [	513 'builder': [

515 'Skia_PerCommit_House_Keeping',	514 'PerCommit-Housekeeping',

516 'Skia_Periodic_House_Keeping',	515 'Periodic-Housekeeping',

517 'Skia_PerCommit_House_Keeping_Trybot',	516 'PerCommit-Housekeeping-Trybot',

518 'Skia_Periodic_House_Keeping_Trybot',	517 'Periodic-Housekeeping-Trybot',

519 ],	518 ],

520 },	519 },

521 ] + [	520 ] + [

522 {	521 {

523 'master': 'Skia',	522 'master': 'Skia',

524 'hostname': 'skiabot-linux-compile-%s' % ('%d' % i).zfill(INTEGER_WIDTH),	523 'hostname': 'skiabot-linux-compile-%s' % ('%d' % i).zfill(INTEGER_WIDTH),

525 'builder': LINUX_COMPILE_BUILDERS,	524 'builder': LINUX_COMPILE_BUILDERS,

526 'num_cores': '8',	525 'num_cores': '8',

527 'android_sdk_root': '/usr/local/google/home/borenet/android_sdk_linux',	526 'android_sdk_root': '/usr/local/google/home/borenet/android_sdk_linux',

528 'nacl_sdk_root': '/usr/local/google/home/borenet/nacl_sdk/pepper_25',	527 'nacl_sdk_root': '/usr/local/google/home/borenet/nacl_sdk/pepper_25',

529 } for i in range(COMPILE_BUILDERS)	528 } for i in range(COMPILE_BUILDERS)

530 ] + [	529 ] + [

531 {	530 {

532 'master': 'Skia',	531 'master': 'Skia',

533 'hostname': 'skiabot-linux-compile-vm-%s' % ('%d' % i).zfill(INTEGER_WIDTH),	532 'hostname': 'skiabot-linux-compile-vm-%s' % ('%d' % i).zfill(INTEGER_WIDTH),

534 'builder': LINUX_COMPILE_BUILDERS,	533 'builder': LINUX_COMPILE_BUILDERS,

535 'num_cores': '2',	534 'num_cores': '2',

536 'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT,	535 'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT,

537 'nacl_sdk_root': DEFAULT_NACL_SDK_ROOT,	536 'nacl_sdk_root': DEFAULT_NACL_SDK_ROOT,

538 } for i in range(COMPILE_BUILDERS)	537 } for i in range(COMPILE_BUILDERS)

539 ] + [	538 ] + [

540 {	539 {

541 'master': 'Skia',	540 'master': 'Skia',

542 'hostname': 'skiabot-mac-10_6-compile-%s' % ('%d' % i).zfill(INTEGER_WIDTH),	541 'hostname': 'skiabot-mac-10_6-compile-%s' % ('%d' % i).zfill(INTEGER_WIDTH),

543 'builder': [	542 'builder': [

544 'Skia_Mac_Float_Compile_Debug_32',	543 'OSX-10_6-MacMini-32-DebugCompile',

545 'Skia_Mac_Float_Compile_Release_32',	544 'OSX-10_6-MacMini-32-ReleaseCompile',

546 'Skia_Mac_Float_Compile_Debug_64',	545 'OSX-10_6-MacMini-64-DebugCompile',

547 'Skia_Mac_Float_Compile_Release_64',	546 'OSX-10_6-MacMini-64-ReleaseCompile',

548 'Skia_Mac_Float_Compile_Debug_32_Trybot',	547 'OSX-10_6-MacMini-32-DebugCompile-Trybot',

549 'Skia_Mac_Float_Compile_Release_32_Trybot',	548 'OSX-10_6-MacMini-32-ReleaseCompile-Trybot',

550 'Skia_Mac_Float_Compile_Debug_64_Trybot',	549 'OSX-10_6-MacMini-64-DebugCompile-Trybot',

551 'Skia_Mac_Float_Compile_Release_64_Trybot',	550 'OSX-10_6-MacMini-64-ReleaseCompile-Trybot',

552 ],	551 ],

553 'num_cores': '8',	552 'num_cores': '8',

554 } for i in range(COMPILE_BUILDERS)	553 } for i in range(COMPILE_BUILDERS)

555 ] + [	554 ] + [

556 {	555 {

557 'master': 'Skia',	556 'master': 'Skia',

558 'hostname': 'skiabot-mac-10_7-compile-%s' % ('%d' % i).zfill(INTEGER_WIDTH),	557 'hostname': 'skiabot-mac-10_7-compile-%s' % ('%d' % i).zfill(INTEGER_WIDTH),

559 'builder': [	558 'builder': [

560 'Skia_MacMiniLion_Float_Compile_Debug_32',	559 '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 Show quoted text On 2013/04/17 17:50:15, borenet wrote: > 3. General question about the compile bots: I don't particularly like the > "CompileDebug" names, but I don't know of a better way. I think the way you have it set up now is reasonable; alternatively, we could add another field which has one of these 6 values: Compile, RunBench, RunNonBench, TryCompile, TryRunBench, TryRunNonBench Show quoted text > Also of note is the > fact that, for the most part, these builder names consist of the TARGET for > which they build, rather than the platform on which they're building. In some > cases, we care about testing builds in different IDE versions, etc, but to say > that our Mac compile bots, for example, are Mac Minis, is flat-out wrong in most > cases, even though from a practical standpoint it doesn't matter that they > really run on Mac Pros. A possible solution (which would add a LOT of > complexity) is to split out the compile bots so that they can be named > differently based on the aspects we care about, eg. > "Win-7-Intel-32-DebugCompile" becomes "Win-7-VS2010-DebugCompile" to denote that > we're building on VS 2010, and we simply don't care whether it has Intel > integrated graphics or what. Another example: > "OSX-10_8-MacMini-32-DebugCompile" --> "OSX-10_8-XCode4.6-32-DebugCompile". > Thoughts? I can think of 3 choices here... of them, I think #1 (the way you already have it) is best. 1. Stick with the current naming. For compile bots, the hardware field indicates the target hardware, not the hardware on which the compile was run. TryCompile-Win7-Shuttle-ATI5770-32-Debug TryRunNonBench-Win7-Shuttle-ATI5770-32-Debug TryRunBench-Win7-Shuttle-ATI5770-32-Debug 2. Change the hardware/GPU fields used for compile bots: TryCompile-Win7-AnyHardware-AnyGPU-32-Debug TryRunNonBench-Win7-Shuttle-ATI5770-32-Debug TryRunBench-Win7-Shuttle-ATI5770-32-Debug Downsides: A. this does not provide a place on the Compile bot to specify whether the code was built in NoGPU mode B. hard to see which compile bot corresponds to each run bot 3. We use a different schema for the 2 different bot types. As an added bonus: later on, that would allow us to list characteristics we care about only when compiling, such as compiler version... TryCompile-Win7-VS2010-32-Debug TryRunNonBench-Win7-Shuttle-ATI5770-32-Debug TryRunBench-Win7-Shuttle-ATI5770-32-Debug Downsides are similar to those of option 2. borenet 2013/04/22 16:29:55 I will keep it as-is for now, but I think we'll ne Show quoted text On 2013/04/19 16:25:44, epoger wrote: > On 2013/04/17 17:50:15, borenet wrote: > > 3. General question about the compile bots: I don't particularly like the > > "CompileDebug" names, but I don't know of a better way. > > I think the way you have it set up now is reasonable; alternatively, we could > add another field which has one of these 6 values: > Compile, RunBench, RunNonBench, > TryCompile, TryRunBench, TryRunNonBench > > > Also of note is the > > fact that, for the most part, these builder names consist of the TARGET for > > which they build, rather than the platform on which they're building. In some > > cases, we care about testing builds in different IDE versions, etc, but to say > > that our Mac compile bots, for example, are Mac Minis, is flat-out wrong in > most > > cases, even though from a practical standpoint it doesn't matter that they > > really run on Mac Pros. A possible solution (which would add a LOT of > > complexity) is to split out the compile bots so that they can be named > > differently based on the aspects we care about, eg. > > "Win-7-Intel-32-DebugCompile" becomes "Win-7-VS2010-DebugCompile" to denote > that > > we're building on VS 2010, and we simply don't care whether it has Intel > > integrated graphics or what. Another example: > > "OSX-10_8-MacMini-32-DebugCompile" --> "OSX-10_8-XCode4.6-32-DebugCompile". > > Thoughts? > > I can think of 3 choices here... of them, I think #1 (the way you already have > it) is best. > > > 1. Stick with the current naming. For compile bots, the hardware field > indicates the target hardware, not the hardware on which the compile was run. > > TryCompile-Win7-Shuttle-ATI5770-32-Debug > TryRunNonBench-Win7-Shuttle-ATI5770-32-Debug > TryRunBench-Win7-Shuttle-ATI5770-32-Debug > > > 2. Change the hardware/GPU fields used for compile bots: > > TryCompile-Win7-AnyHardware-AnyGPU-32-Debug > TryRunNonBench-Win7-Shuttle-ATI5770-32-Debug > TryRunBench-Win7-Shuttle-ATI5770-32-Debug > > Downsides: > A. this does not provide a place on the Compile bot to specify whether the code > was built in NoGPU mode > B. hard to see which compile bot corresponds to each run bot > > > 3. We use a different schema for the 2 different bot types. As an added bonus: > later on, that would allow us to list characteristics we care about only when > compiling, such as compiler version... > > TryCompile-Win7-VS2010-32-Debug > TryRunNonBench-Win7-Shuttle-ATI5770-32-Debug > TryRunBench-Win7-Shuttle-ATI5770-32-Debug > > Downsides are similar to those of option 2. I will keep it as-is for now, but I think we'll need to separate out the compile builders in the near future.
561 'Skia_MacMiniLion_Float_Compile_Release_32',	560 'OSX-10_7-MacMini-32-ReleaseCompile',

562 'Skia_MacMiniLion_Float_Compile_Debug_64',	561 'OSX-10_7-MacMini-64-DebugCompile',

563 'Skia_MacMiniLion_Float_Compile_Release_64',	562 'OSX-10_7-MacMini-64-ReleaseCompile',

564 'Skia_iOS_Compile_Debug_32',	563 'iOS-6-iPhone-32-DebugCompile',

565 'Skia_iOS_Compile_Release_32',	564 'iOS-6-iPhone-32-ReleaseCompile',

566 'Skia_MacMiniLion_Float_Compile_Debug_32_Trybot',	565 'OSX-10_7-MacMini-32-DebugCompile-Trybot',

567 'Skia_MacMiniLion_Float_Compile_Release_32_Trybot',	566 'OSX-10_7-MacMini-32-ReleaseCompile-Trybot',

568 'Skia_MacMiniLion_Float_Compile_Debug_64_Trybot',	567 'OSX-10_7-MacMini-64-DebugCompile-Trybot',

569 'Skia_MacMiniLion_Float_Compile_Release_64_Trybot',	568 'OSX-10_7-MacMini-64-ReleaseCompile-Trybot',

570 'Skia_iOS_Compile_Debug_32_Trybot',	569 'iOS-6-iPhone-32-DebugCompile-Trybot',

571 'Skia_iOS_Compile_Release_32_Trybot',	570 'iOS-6-iPhone-32-ReleaseCompile-Trybot',

572 ],	571 ],

573 'num_cores': '8',	572 'num_cores': '8',

574 } for i in range(COMPILE_BUILDERS)	573 } for i in range(COMPILE_BUILDERS)

575 ] + [	574 ] + [

576 {	575 {

577 'master': 'Skia',	576 'master': 'Skia',

578 'hostname': 'skiabot-mac-10_8-compile-%s' % ('%d' % i).zfill(INTEGER_WIDTH),	577 'hostname': 'skiabot-mac-10_8-compile-%s' % ('%d' % i).zfill(INTEGER_WIDTH),

579 'builder': [	578 'builder': [

580 'Skia_MacMini_10_8_Float_Compile_Debug_32',	579 'OSX-10_8-MacMini-32-DebugCompile',

581 'Skia_MacMini_10_8_Float_Compile_Release_32',	580 'OSX-10_8-MacMini-32-ReleaseCompile',

582 'Skia_MacMini_10_8_Float_Compile_Debug_64',	581 'OSX-10_8-MacMini-64-DebugCompile',

583 'Skia_MacMini_10_8_Float_Compile_Release_64',	582 'OSX-10_8-MacMini-64-ReleaseCompile',

584 'Skia_MacMini_10_8_Float_Compile_Debug_32_Trybot',	583 'OSX-10_8-MacMini-32-DebugCompile-Trybot',

585 'Skia_MacMini_10_8_Float_Compile_Release_32_Trybot',	584 'OSX-10_8-MacMini-32-ReleaseCompile-Trybot',

586 'Skia_MacMini_10_8_Float_Compile_Debug_64_Trybot',	585 'OSX-10_8-MacMini-64-DebugCompile-Trybot',

587 'Skia_MacMini_10_8_Float_Compile_Release_64_Trybot',	586 'OSX-10_8-MacMini-64-ReleaseCompile-Trybot',

588 ],	587 ],

589 'num_cores': '8',	588 'num_cores': '8',

590 } for i in range(COMPILE_BUILDERS)	589 } for i in range(COMPILE_BUILDERS)

591 ] + [	590 ] + [

592 {	591 {

593 'master': 'Skia',	592 'master': 'Skia',

594 'hostname': 'skiabot-win-compile-%s' % ('%d' % i).zfill(INTEGER_WIDTH),	593 'hostname': 'skiabot-win-compile-%s' % ('%d' % i).zfill(INTEGER_WIDTH),

595 'builder': [	594 'builder': [

596 'Skia_Shuttle_Win7_Intel_Float_Compile_Debug_32',	595 'Win-7-Intel-32-DebugCompile',

597 'Skia_Shuttle_Win7_Intel_Float_Compile_Release_32',	596 'Win-7-Intel-32-ReleaseCompile',

598 'Skia_Shuttle_Win7_Intel_Float_Compile_Debug_64',	597 'Win-7-Intel-64-DebugCompile',

599 'Skia_Shuttle_Win7_Intel_Float_Compile_Release_64',	598 'Win-7-Intel-64-ReleaseCompile',

600 'Skia_Shuttle_Win7_Intel_Float_ANGLE_Compile_Debug_32',	599 'Win-7-Intel-32-DebugCompile-ANGLE',

601 'Skia_Shuttle_Win7_Intel_Float_ANGLE_Compile_Release_32',	600 'Win-7-Intel-32-ReleaseCompile-ANGLE',

602 'Skia_Shuttle_Win7_Intel_Float_DirectWrite_Compile_Debug_32',	601 'Win-7-Intel-32-DebugCompile-DirectWrite',

603 'Skia_Shuttle_Win7_Intel_Float_DirectWrite_Compile_Release_32',	602 'Win-7-Intel-32-ReleaseCompile-DirectWrite',

604 'Skia_Shuttle_Win7_Intel_Float_Compile_Debug_32_Trybot',	603 'Win-7-Intel-32-DebugCompile-Trybot',

605 'Skia_Shuttle_Win7_Intel_Float_Compile_Release_32_Trybot',	604 'Win-7-Intel-32-ReleaseCompile-Trybot',

606 'Skia_Shuttle_Win7_Intel_Float_Compile_Debug_64_Trybot',	605 'Win-7-Intel-64-DebugCompile-Trybot',

607 'Skia_Shuttle_Win7_Intel_Float_Compile_Release_64_Trybot',	606 'Win-7-Intel-64-ReleaseCompile-Trybot',

608 'Skia_Shuttle_Win7_Intel_Float_ANGLE_Compile_Debug_32_Trybot',	607 'Win-7-Intel-32-DebugCompile-ANGLE-Trybot',

609 'Skia_Shuttle_Win7_Intel_Float_ANGLE_Compile_Release_32_Trybot',	608 'Win-7-Intel-32-ReleaseCompile-ANGLE-Trybot',

610 'Skia_Shuttle_Win7_Intel_Float_DirectWrite_Compile_Debug_32_Trybot',	609 'Win-7-Intel-32-DebugCompile-DirectWrite-Trybot',

611 'Skia_Shuttle_Win7_Intel_Float_DirectWrite_Compile_Release_32_Trybot',	610 'Win-7-Intel-32-ReleaseCompile-DirectWrite-Trybot',

612 ],	611 ],

613 'num_cores': '8',	612 'num_cores': '8',

614 } for i in range(COMPILE_BUILDERS)	613 } for i in range(COMPILE_BUILDERS)

615 ]]	614 ]]

OLD	NEW

« master/master_builders_cfg.py ('K') | « master/skia_master_scripts/utils.py ('k') | no next file » | no next file with comments »