OLD | NEW |
1 # -*- python -*- | 1 # -*- python -*- |
2 # ex: set syntax=python: | 2 # ex: set syntax=python: |
3 | 3 |
4 # Copyright 2015 The Chromium Authors. All rights reserved. | 4 # Copyright 2015 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 slaves = [ | 8 slaves = [ |
9 { | 9 { |
10 'master': 'Infra', | 10 'master': 'Infra', |
11 'builder': [ | 11 'builder': [ |
| 12 'conda-cipd-pkg-trusty-64', |
12 'infra-continuous-trusty-64', | 13 'infra-continuous-trusty-64', |
13 'luci-gae-trusty64', | 14 'luci-gae-trusty64', |
14 'luci-go-trusty64', | 15 'luci-go-trusty64', |
15 ], | 16 ], |
16 'hostname': 'vm822-m1', | 17 'hostname': 'vm822-m1', |
17 'os': 'linux', | 18 'os': 'linux', |
18 'version': 'trusty', | 19 'version': 'trusty', |
19 'bits': '64', | 20 'bits': '64', |
20 }, | 21 }, |
21 { | 22 { |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
61 'master': 'Infra', | 62 'master': 'Infra', |
62 'builder': ['infra-continuous-mac-10.10-64'], | 63 'builder': ['infra-continuous-mac-10.10-64'], |
63 'hostname': 'vm69-m1', | 64 'hostname': 'vm69-m1', |
64 'os': 'mac', | 65 'os': 'mac', |
65 'version': '10.10', | 66 'version': '10.10', |
66 'bits': '64', | 67 'bits': '64', |
67 }, | 68 }, |
68 { | 69 { |
69 'master': 'Infra', | 70 'master': 'Infra', |
70 'builder': [ | 71 'builder': [ |
| 72 'conda-cipd-pkg-mac-10.9-64', |
71 'infra-continuous-mac-10.9-64', | 73 'infra-continuous-mac-10.9-64', |
72 'luci-go-osx', | 74 'luci-go-osx', |
73 ], | 75 ], |
74 'hostname': 'vm43-m1', | 76 'hostname': 'vm43-m1', |
75 'os': 'mac', | 77 'os': 'mac', |
76 'version': '10.9', | 78 'version': '10.9', |
77 'bits': '64', | 79 'bits': '64', |
78 }, | 80 }, |
79 { | 81 { |
80 'master': 'Infra', | 82 'master': 'Infra', |
(...skipping 23 matching lines...) Expand all Loading... |
104 'master': 'Infra', | 106 'master': 'Infra', |
105 'builder': ['infra-continuous-win-32'], | 107 'builder': ['infra-continuous-win-32'], |
106 'hostname': 'vm420-m1', | 108 'hostname': 'vm420-m1', |
107 'os': 'win', | 109 'os': 'win', |
108 'version': 'win7', | 110 'version': 'win7', |
109 'bits': '32', | 111 'bits': '32', |
110 }, | 112 }, |
111 { | 113 { |
112 'master': 'Infra', | 114 'master': 'Infra', |
113 'builder': [ | 115 'builder': [ |
| 116 'conda-cipd-pkg-win-64', |
114 'infra-continuous-win-64', | 117 'infra-continuous-win-64', |
115 'luci-go-win64', | 118 'luci-go-win64', |
116 ], | 119 ], |
117 'hostname': 'vm412-m1', | 120 'hostname': 'vm412-m1', |
118 'os': 'win', | 121 'os': 'win', |
119 'version': 'win7', | 122 'version': 'win7', |
120 'bits': '64', | 123 'bits': '64', |
121 }, | 124 }, |
122 ] | 125 ] |
OLD | NEW |