| OLD | NEW |
| 1 # -*- python -*- | 1 # -*- python -*- |
| 2 # ex: set syntax=python: | 2 # ex: set syntax=python: |
| 3 | 3 |
| 4 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 4 # Copyright (c) 2012 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 |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 'bits': '64', | 61 'bits': '64', |
| 62 }, | 62 }, |
| 63 { | 63 { |
| 64 'master': 'ChromiumLinux', | 64 'master': 'ChromiumLinux', |
| 65 'builder': 'Cast Linux', | 65 'builder': 'Cast Linux', |
| 66 'hostname': 'vm28-m1', | 66 'hostname': 'vm28-m1', |
| 67 'os': 'linux', | 67 'os': 'linux', |
| 68 'version': 'precise', | 68 'version': 'precise', |
| 69 'bits': '64', | 69 'bits': '64', |
| 70 }, | 70 }, |
| 71 |
| 72 # trusty |
| 73 { |
| 74 'master': 'ChromiumLinux', |
| 75 'hostname': 'slave128-c1', |
| 76 'builder': 'Linux Builder Trusty', |
| 77 'os': 'linux', |
| 78 'version': 'trusty', |
| 79 'bits': '64', |
| 80 }, |
| 71 { | 81 { |
| 72 'master': 'ChromiumLinux', | 82 'master': 'ChromiumLinux', |
| 83 'hostname': 'slave131-c1', |
| 84 'builder': 'Linux Tests Trusty', |
| 85 'os': 'linux', |
| 86 'version': 'trusty', |
| 87 'bits': '64', |
| 88 }, |
| 89 { |
| 90 'master': 'ChromiumLinux', |
| 91 'hostname': 'slave132-c1', |
| 92 'builder': 'Linux Tests Trusty (dbg)(1)(32)', |
| 93 'os': 'linux', |
| 94 'version': 'trusty', |
| 95 'bits': '64', |
| 96 }, |
| 97 { |
| 98 'master': 'ChromiumLinux', |
| 99 'hostname': 'slave129-c1', |
| 100 'builder': 'Linux Builder Trusty (dbg)', |
| 101 'os': 'linux', |
| 102 'version': 'trusty', |
| 103 'bits': '64', |
| 104 }, |
| 105 { |
| 106 'master': 'ChromiumLinux', |
| 107 'builder': 'Linux Builder Trusty (dbg)(32)', |
| 108 'hostname': 'slave130-c1', |
| 109 'os': 'linux', |
| 110 'version': 'trusty', |
| 111 'bits': '64', |
| 112 }, |
| 113 { |
| 114 'master': 'ChromiumLinux', |
| 115 'hostname': 'slave133-c1', |
| 116 'builder': 'Linux Tests Trusty (dbg)(1)', |
| 117 'os': 'linux', |
| 118 'version': 'trusty', |
| 119 'bits': '64', |
| 120 }, |
| 121 { |
| 122 'master': 'ChromiumLinux', |
| 123 'builder': 'Cast Linux Trusty', |
| 124 'hostname': 'slave134-c1', |
| 125 'os': 'linux', |
| 126 'version': 'trusty', |
| 127 'bits': '64', |
| 128 }, |
| 129 |
| 130 { |
| 131 'master': 'ChromiumLinux', |
| 73 'builder': 'Blimp Linux (dbg)', | 132 'builder': 'Blimp Linux (dbg)', |
| 74 'hostname': 'slave77-c1', | 133 'hostname': 'slave77-c1', |
| 75 'os': 'linux', | 134 'os': 'linux', |
| 76 'version': 'trusty', | 135 'version': 'trusty', |
| 77 'bits': '64', | 136 'bits': '64', |
| 78 }, | 137 }, |
| 79 ################################################################################ | 138 ################################################################################ |
| 80 # Android | 139 # Android |
| 81 ################################################################################ | 140 ################################################################################ |
| 82 { | 141 { |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 129 }, | 188 }, |
| 130 { | 189 { |
| 131 'master': 'ChromiumLinux', | 190 'master': 'ChromiumLinux', |
| 132 'builder': 'Cast Android (dbg)', | 191 'builder': 'Cast Android (dbg)', |
| 133 'hostname': 'vm29-m1', | 192 'hostname': 'vm29-m1', |
| 134 'os': 'linux', | 193 'os': 'linux', |
| 135 'version': 'precise', | 194 'version': 'precise', |
| 136 'bits': '64', | 195 'bits': '64', |
| 137 }, | 196 }, |
| 138 ] | 197 ] |
| OLD | NEW |