Chromium Code Reviews| Index: site_config/slave_hosts_cfg.py |
| diff --git a/site_config/slave_hosts_cfg.py b/site_config/slave_hosts_cfg.py |
| index 9b8678aa9fbdfd7a498da82c254d2cc0ed5adb8d..19020a48731023e338720e62df90550bbb2e923c 100644 |
| --- a/site_config/slave_hosts_cfg.py |
| +++ b/site_config/slave_hosts_cfg.py |
| @@ -31,12 +31,6 @@ NO_KVM_NUM = '(not on KVM)' |
| NO_IP_ADDR = '(no static IP)' |
| # Files to copy into buildslave checkouts. |
| -DEFAULT_COPIES = [ |
| - { |
| - "source": ".boto", |
| - "destination": "buildbot/third_party/chromium_buildbot/site_config", |
| - }, |
| -] |
| CHROMEBUILD_COPIES = [ |
| { |
| "source": ".boto", |
| @@ -96,9 +90,9 @@ _slave_host_dicts = { |
| 'skiabot-shuttle-ubuntu12-gtx550ti-001': { |
| 'slaves': [ |
| - ('skiabot-shuttle-ubuntu12-gtx550ti-001', '0', True), |
| + ('skiabot-shuttle-ubuntu12-gtx550ti-001', '0', False), |
|
borenet
2014/10/17 18:04:18
The bool in this column has changed meaning from "
|
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': skia_lab_login, |
| 'ip': '192.168.1.132', |
| 'kvm_num': 'A', |
| @@ -110,12 +104,12 @@ _slave_host_dicts = { |
| 'skiabot-shuttle-ubuntu12-gtx660-001': { |
| 'slaves': [ |
| - ('skiabot-shuttle-ubuntu12-gtx660-000', '0', True), |
| - ('skiabot-shuttle-ubuntu12-gtx660-001', '0', True), |
| - ('skiabot-shuttle-ubuntu12-gtx660-002', '0', True), |
| - ('skiabot-shuttle-ubuntu12-gtx660-003', '0', True), |
| + ('skiabot-shuttle-ubuntu12-gtx660-000', '0', False), |
| + ('skiabot-shuttle-ubuntu12-gtx660-001', '0', False), |
| + ('skiabot-shuttle-ubuntu12-gtx660-002', '0', False), |
| + ('skiabot-shuttle-ubuntu12-gtx660-003', '0', False), |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': skia_lab_login, |
| 'ip': '192.168.1.113', |
| 'kvm_num': 'E', |
| @@ -127,9 +121,9 @@ _slave_host_dicts = { |
| 'skiabot-shuttle-ubuntu12-gtx660-002': { |
| 'slaves': [ |
| - ('skiabot-shuttle-ubuntu12-gtx660-bench', '0', True), |
| + ('skiabot-shuttle-ubuntu12-gtx660-bench', '0', False), |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': skia_lab_login, |
| 'ip': '192.168.1.122', |
| 'kvm_num': 'F', |
| @@ -141,19 +135,19 @@ _slave_host_dicts = { |
| 'skiabot-shuttle-ubuntu12-android-003': { |
| 'slaves': [ |
| - ('skiabot-shuttle-ubuntu12-xoom-001', '0', True), |
| - ('skiabot-shuttle-ubuntu12-xoom-002', '1', True), |
| - ('skiabot-shuttle-ubuntu12-xoom-003', '2', True), |
| - ('skiabot-shuttle-ubuntu12-nexus7-001', '6', True), |
| - ('skiabot-shuttle-ubuntu12-nexus7-002', '7', True), |
| - ('skiabot-shuttle-ubuntu12-nexus7-003', '8', True), |
| - ('skiabot-shuttle-ubuntu12-nexus10-001', '9', True), |
| - ('skiabot-shuttle-ubuntu12-nexus10-003', '10', True), |
| - ('skiabot-shuttle-ubuntu12-venue8-001', '11', True), |
| - ('skiabot-shuttle-ubuntu12-nexus5-001', '12', True), |
| - ('skiabot-shuttle-ubuntu12-nexus5-002', '13', True), |
| - ], |
| - 'copies': DEFAULT_COPIES, |
| + ('skiabot-shuttle-ubuntu12-xoom-001', '0', False), |
| + ('skiabot-shuttle-ubuntu12-xoom-002', '1', False), |
| + ('skiabot-shuttle-ubuntu12-xoom-003', '2', False), |
| + ('skiabot-shuttle-ubuntu12-nexus7-001', '6', False), |
| + ('skiabot-shuttle-ubuntu12-nexus7-002', '7', False), |
| + ('skiabot-shuttle-ubuntu12-nexus7-003', '8', False), |
| + ('skiabot-shuttle-ubuntu12-nexus10-001', '9', False), |
| + ('skiabot-shuttle-ubuntu12-nexus10-003', '10', False), |
| + ('skiabot-shuttle-ubuntu12-venue8-001', '11', False), |
| + ('skiabot-shuttle-ubuntu12-nexus5-001', '12', False), |
| + ('skiabot-shuttle-ubuntu12-nexus5-002', '13', False), |
| + ], |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': skia_lab_login, |
| 'ip': '192.168.1.110', |
| 'kvm_num': 'C', |
| @@ -165,12 +159,12 @@ _slave_host_dicts = { |
| 'skiabot-shuttle-ubuntu12-xxx': { |
| 'slaves': [ |
| - ('skiabot-shuttle-ubuntu12-002', '2', True), |
| - ('skiabot-shuttle-ubuntu12-003', '3', True), |
| - ('skiabot-shuttle-ubuntu12-004', '4', True), |
| + ('skiabot-shuttle-ubuntu12-002', '2', False), |
| + ('skiabot-shuttle-ubuntu12-003', '3', False), |
| + ('skiabot-shuttle-ubuntu12-004', '4', False), |
| ('skiabot-shuttle-ubuntu12-arm64-001', '5', True), |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': skia_lab_login, |
| 'ip': '192.168.1.109', |
| 'kvm_num': 'B', |
| @@ -183,7 +177,7 @@ _slave_host_dicts = { |
| 'skiabot-shuttle-ubuntu13-xxx': { |
| 'slaves': [ |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': skia_lab_login, |
| 'ip': '192.168.1.120', |
| 'kvm_num': 'D', |
| @@ -196,7 +190,7 @@ _slave_host_dicts = { |
| 'skiabot-shuttle-ubuntu13-002': { |
| 'slaves': [ |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': skia_lab_login, |
| 'ip': '192.168.1.115', |
| 'kvm_num': 'G', |
| @@ -208,9 +202,9 @@ _slave_host_dicts = { |
| 'skia-vm-001': { |
| 'slaves': [ |
| - ('skiabot-linux-compile-000', '0', True), |
| + ('skiabot-linux-compile-000', '0', False), |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': chromecompute_login, |
| 'ip': NO_IP_ADDR, |
| 'kvm_num': NO_KVM_NUM, |
| @@ -222,9 +216,9 @@ _slave_host_dicts = { |
| 'skia-vm-002': { |
| 'slaves': [ |
| - ('skiabot-linux-compile-001', '0', True), |
| + ('skiabot-linux-compile-001', '0', False), |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': chromecompute_login, |
| 'ip': NO_IP_ADDR, |
| 'kvm_num': NO_KVM_NUM, |
| @@ -236,9 +230,9 @@ _slave_host_dicts = { |
| 'skia-vm-003': { |
| 'slaves': [ |
| - ('skiabot-linux-compile-002', '0', True), |
| + ('skiabot-linux-compile-002', '0', False), |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': chromecompute_login, |
| 'ip': NO_IP_ADDR, |
| 'kvm_num': NO_KVM_NUM, |
| @@ -250,9 +244,9 @@ _slave_host_dicts = { |
| 'skia-vm-004': { |
| 'slaves': [ |
| - ('skiabot-linux-compile-003', '0', True), |
| + ('skiabot-linux-compile-003', '0', False), |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': chromecompute_login, |
| 'ip': NO_IP_ADDR, |
| 'kvm_num': NO_KVM_NUM, |
| @@ -264,9 +258,9 @@ _slave_host_dicts = { |
| 'skia-vm-005': { |
| 'slaves': [ |
| - ('skiabot-linux-compile-004', '0', True), |
| + ('skiabot-linux-compile-004', '0', False), |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': chromecompute_login, |
| 'ip': NO_IP_ADDR, |
| 'kvm_num': NO_KVM_NUM, |
| @@ -278,9 +272,9 @@ _slave_host_dicts = { |
| 'skia-vm-006': { |
| 'slaves': [ |
| - ('skiabot-linux-compile-005', '0', True), |
| + ('skiabot-linux-compile-005', '0', False), |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': chromecompute_login, |
| 'ip': NO_IP_ADDR, |
| 'kvm_num': NO_KVM_NUM, |
| @@ -292,9 +286,9 @@ _slave_host_dicts = { |
| 'skia-vm-007': { |
| 'slaves': [ |
| - ('skiabot-linux-compile-006', '0', True), |
| + ('skiabot-linux-compile-006', '0', False), |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': chromecompute_login, |
| 'ip': NO_IP_ADDR, |
| 'kvm_num': NO_KVM_NUM, |
| @@ -306,9 +300,9 @@ _slave_host_dicts = { |
| 'skia-vm-008': { |
| 'slaves': [ |
| - ('skiabot-linux-compile-007', '0', True), |
| + ('skiabot-linux-compile-007', '0', False), |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': chromecompute_login, |
| 'ip': NO_IP_ADDR, |
| 'kvm_num': NO_KVM_NUM, |
| @@ -320,9 +314,9 @@ _slave_host_dicts = { |
| 'skia-vm-009': { |
| 'slaves': [ |
| - ('skiabot-linux-compile-008', '0', True), |
| + ('skiabot-linux-compile-008', '0', False), |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': chromecompute_login, |
| 'ip': NO_IP_ADDR, |
| 'kvm_num': NO_KVM_NUM, |
| @@ -334,9 +328,9 @@ _slave_host_dicts = { |
| 'skia-vm-010': { |
| 'slaves': [ |
| - ('skiabot-linux-compile-009', '0', True), |
| + ('skiabot-linux-compile-009', '0', False), |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': chromecompute_login, |
| 'ip': NO_IP_ADDR, |
| 'kvm_num': NO_KVM_NUM, |
| @@ -348,9 +342,9 @@ _slave_host_dicts = { |
| 'skia-vm-011': { |
| 'slaves': [ |
| - ('skiabot-linux-compile-010', '0', True), |
| + ('skiabot-linux-compile-010', '0', False), |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': chromecompute_login, |
| 'ip': NO_IP_ADDR, |
| 'kvm_num': NO_KVM_NUM, |
| @@ -362,9 +356,9 @@ _slave_host_dicts = { |
| 'skia-vm-012': { |
| 'slaves': [ |
| - ('skiabot-linux-compile-011', '0', True), |
| + ('skiabot-linux-compile-011', '0', False), |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': chromecompute_login, |
| 'ip': NO_IP_ADDR, |
| 'kvm_num': NO_KVM_NUM, |
| @@ -376,10 +370,10 @@ _slave_host_dicts = { |
| 'skia-vm-013': { |
| 'slaves': [ |
| - ('skiabot-linux-compile-012', '0', True), |
| - ('skiabot-linux-housekeeper-000', '1', True), |
| + ('skiabot-linux-compile-012', '0', False), |
| + ('skiabot-linux-housekeeper-000', '1', False), |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': chromecompute_login, |
| 'ip': NO_IP_ADDR, |
| 'kvm_num': NO_KVM_NUM, |
| @@ -393,7 +387,7 @@ _slave_host_dicts = { |
| 'slaves': [ |
| ('skia-android-canary', '0', True), |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': chromecompute_login, |
| 'ip': NO_IP_ADDR, |
| 'kvm_num': NO_KVM_NUM, |
| @@ -406,7 +400,7 @@ _slave_host_dicts = { |
| 'skia-vm-015': { |
| 'slaves': [ |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': chromecompute_login, |
| 'ip': NO_IP_ADDR, |
| 'kvm_num': NO_KVM_NUM, |
| @@ -418,9 +412,9 @@ _slave_host_dicts = { |
| 'skia-vm-016': { |
| 'slaves': [ |
| - ('skiabot-win-compile-000', '0', True), |
| + ('skiabot-win-compile-000', '0', False), |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': None, |
| 'ip': NO_IP_ADDR, |
| 'kvm_num': NO_KVM_NUM, |
| @@ -432,9 +426,9 @@ _slave_host_dicts = { |
| 'skia-vm-017': { |
| 'slaves': [ |
| - ('skiabot-win-compile-001', '0', True), |
| + ('skiabot-win-compile-001', '0', False), |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': None, |
| 'ip': NO_IP_ADDR, |
| 'kvm_num': NO_KVM_NUM, |
| @@ -446,9 +440,9 @@ _slave_host_dicts = { |
| 'skia-vm-018': { |
| 'slaves': [ |
| - ('skiabot-win-compile-002', '0', True), |
| + ('skiabot-win-compile-002', '0', False), |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': None, |
| 'ip': NO_IP_ADDR, |
| 'kvm_num': NO_KVM_NUM, |
| @@ -460,9 +454,9 @@ _slave_host_dicts = { |
| 'skia-vm-019': { |
| 'slaves': [ |
| - ('skiabot-win-compile-003', '0', True), |
| + ('skiabot-win-compile-003', '0', False), |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': None, |
| 'ip': NO_IP_ADDR, |
| 'kvm_num': NO_KVM_NUM, |
| @@ -474,9 +468,9 @@ _slave_host_dicts = { |
| 'skia-vm-020': { |
| 'slaves': [ |
| - ('skiabot-linux-tester-000', '0', True), |
| + ('skiabot-linux-tester-000', '0', False), |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': chromecompute_login, |
| 'ip': NO_IP_ADDR, |
| 'kvm_num': NO_KVM_NUM, |
| @@ -488,9 +482,9 @@ _slave_host_dicts = { |
| 'skia-vm-021': { |
| 'slaves': [ |
| - ('skiabot-linux-tester-001', '0', True), |
| + ('skiabot-linux-tester-001', '0', False), |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': chromecompute_login, |
| 'ip': NO_IP_ADDR, |
| 'kvm_num': NO_KVM_NUM, |
| @@ -502,9 +496,9 @@ _slave_host_dicts = { |
| 'skia-vm-022': { |
| 'slaves': [ |
| - ('skiabot-linux-tester-002', '0', True), |
| + ('skiabot-linux-tester-002', '0', False), |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': chromecompute_login, |
| 'ip': NO_IP_ADDR, |
| 'kvm_num': NO_KVM_NUM, |
| @@ -516,9 +510,9 @@ _slave_host_dicts = { |
| 'skia-vm-023': { |
| 'slaves': [ |
| - ('skiabot-linux-tester-003', '0', True), |
| + ('skiabot-linux-tester-003', '0', False), |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': chromecompute_login, |
| 'ip': NO_IP_ADDR, |
| 'kvm_num': NO_KVM_NUM, |
| @@ -531,7 +525,7 @@ _slave_host_dicts = { |
| 'skia-vm-024': { |
| 'slaves': [ |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': chromecompute_login, |
| 'ip': NO_IP_ADDR, |
| 'kvm_num': NO_KVM_NUM, |
| @@ -544,7 +538,7 @@ _slave_host_dicts = { |
| 'skia-vm-025': { |
| 'slaves': [ |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': chromecompute_login, |
| 'ip': NO_IP_ADDR, |
| 'kvm_num': NO_KVM_NUM, |
| @@ -557,7 +551,7 @@ _slave_host_dicts = { |
| 'skia-vm-026': { |
| 'slaves': [ |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': chromecompute_login, |
| 'ip': NO_IP_ADDR, |
| 'kvm_num': NO_KVM_NUM, |
| @@ -569,9 +563,9 @@ _slave_host_dicts = { |
| 'skia-vm-027': { |
| 'slaves': [ |
| - ('skiabot-linux-xsan-000', '0', True), |
| + ('skiabot-linux-xsan-000', '0', False), |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': chromecompute_login, |
| 'ip': NO_IP_ADDR, |
| 'kvm_num': NO_KVM_NUM, |
| @@ -583,9 +577,9 @@ _slave_host_dicts = { |
| 'skia-vm-028': { |
| 'slaves': [ |
| - ('skiabot-linux-xsan-001', '0', True), |
| + ('skiabot-linux-xsan-001', '0', False), |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': chromecompute_login, |
| 'ip': NO_IP_ADDR, |
| 'kvm_num': NO_KVM_NUM, |
| @@ -598,7 +592,7 @@ _slave_host_dicts = { |
| 'skia-vm-029': { |
| 'slaves': [ |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': chromecompute_login, |
| 'ip': NO_IP_ADDR, |
| 'kvm_num': NO_KVM_NUM, |
| @@ -611,7 +605,7 @@ _slave_host_dicts = { |
| 'skia-vm-030': { |
| 'slaves': [ |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': None, |
| 'ip': NO_IP_ADDR, |
| 'kvm_num': NO_KVM_NUM, |
| @@ -624,7 +618,7 @@ _slave_host_dicts = { |
| 'skia-vm-031': { |
| 'slaves': [ |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': None, |
| 'ip': NO_IP_ADDR, |
| 'kvm_num': NO_KVM_NUM, |
| @@ -637,7 +631,7 @@ _slave_host_dicts = { |
| 'skia-vm-032': { |
| 'slaves': [ |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': None, |
| 'ip': NO_IP_ADDR, |
| 'kvm_num': NO_KVM_NUM, |
| @@ -650,7 +644,7 @@ _slave_host_dicts = { |
| 'skia-vm-101': { |
| 'slaves': [ |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': chromecompute_login, |
| 'ip': NO_IP_ADDR, |
| 'kvm_num': NO_KVM_NUM, |
| @@ -664,10 +658,10 @@ _slave_host_dicts = { |
| 'skiabot-macmini-10_6-001': { |
| 'slaves': [ |
| - ('skiabot-macmini-10_6-000', '0', True), |
| - ('skiabot-macmini-10_6-001', '1', True), |
| + ('skiabot-macmini-10_6-000', '0', False), |
| + ('skiabot-macmini-10_6-001', '1', False), |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': skia_lab_login, |
| 'ip': '192.168.1.144', |
| 'kvm_num': '2', |
| @@ -679,10 +673,10 @@ _slave_host_dicts = { |
| 'skiabot-macmini-10_6-002': { |
| 'slaves': [ |
| - ('skiabot-macmini-10_6-002', '2', True), |
| - ('skiabot-macmini-10_6-003', '3', True), |
| + ('skiabot-macmini-10_6-002', '2', False), |
| + ('skiabot-macmini-10_6-003', '3', False), |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': skia_lab_login, |
| 'ip': '192.168.1.121', |
| 'kvm_num': '1', |
| @@ -694,10 +688,10 @@ _slave_host_dicts = { |
| 'skiabot-macmini-10_7-001': { |
| 'slaves': [ |
| - ('skiabot-macmini-10_7-000', '0', True), |
| - ('skiabot-macmini-10_7-001', '1', True), |
| + ('skiabot-macmini-10_7-000', '0', False), |
| + ('skiabot-macmini-10_7-001', '1', False), |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': skia_lab_login, |
| 'ip': '192.168.1.137', |
| 'kvm_num': '3', |
| @@ -709,9 +703,9 @@ _slave_host_dicts = { |
| 'skiabot-macmini-10_7-002': { |
| 'slaves': [ |
| - ('skiabot-macmini-10_7-bench', '0', True), |
| + ('skiabot-macmini-10_7-bench', '0', False), |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': skia_lab_login, |
| 'ip': '192.168.1.124', |
| 'kvm_num': '4', |
| @@ -723,10 +717,10 @@ _slave_host_dicts = { |
| 'skiabot-macmini-10_8-001': { |
| 'slaves': [ |
| - ('skiabot-macmini-10_8-000', '0', True), |
| - ('skiabot-macmini-10_8-001', '1', True), |
| + ('skiabot-macmini-10_8-000', '0', False), |
| + ('skiabot-macmini-10_8-001', '1', False), |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': skia_lab_login, |
| 'ip': '192.168.1.125', |
| 'kvm_num': '8', |
| @@ -738,9 +732,9 @@ _slave_host_dicts = { |
| 'skiabot-macmini-10_8-002': { |
| 'slaves': [ |
| - ('skiabot-macmini-10_8-bench', '0', True), |
| + ('skiabot-macmini-10_8-bench', '0', False), |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': skia_lab_login, |
| 'ip': '192.168.1.135', |
| 'kvm_num': '6', |
| @@ -752,18 +746,18 @@ _slave_host_dicts = { |
| 'skiabot-mac-10_7-compile': { |
| 'slaves': [ |
| - ('skiabot-mac-10_7-compile-000', '0', True), |
| - ('skiabot-mac-10_7-compile-001', '1', True), |
| - ('skiabot-mac-10_7-compile-002', '2', True), |
| - ('skiabot-mac-10_7-compile-003', '3', True), |
| - ('skiabot-mac-10_7-compile-004', '4', True), |
| - ('skiabot-mac-10_7-compile-005', '5', True), |
| - ('skiabot-mac-10_7-compile-006', '6', True), |
| - ('skiabot-mac-10_7-compile-007', '7', True), |
| - ('skiabot-mac-10_7-compile-008', '8', True), |
| - ('skiabot-mac-10_7-compile-009', '9', True), |
| - ], |
| - 'copies': DEFAULT_COPIES, |
| + ('skiabot-mac-10_7-compile-000', '0', False), |
| + ('skiabot-mac-10_7-compile-001', '1', False), |
| + ('skiabot-mac-10_7-compile-002', '2', False), |
| + ('skiabot-mac-10_7-compile-003', '3', False), |
| + ('skiabot-mac-10_7-compile-004', '4', False), |
| + ('skiabot-mac-10_7-compile-005', '5', False), |
| + ('skiabot-mac-10_7-compile-006', '6', False), |
| + ('skiabot-mac-10_7-compile-007', '7', False), |
| + ('skiabot-mac-10_7-compile-008', '8', False), |
| + ('skiabot-mac-10_7-compile-009', '9', False), |
| + ], |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': skia_lab_login, |
| 'ip': '192.168.1.118', |
| 'kvm_num': '5', |
| @@ -775,18 +769,18 @@ _slave_host_dicts = { |
| 'skiabot-mac-10_8-compile': { |
| 'slaves': [ |
| - ('skiabot-mac-10_8-compile-000', '0', True), |
| - ('skiabot-mac-10_8-compile-001', '1', True), |
| - ('skiabot-mac-10_8-compile-002', '2', True), |
| - ('skiabot-mac-10_8-compile-003', '3', True), |
| - ('skiabot-mac-10_8-compile-004', '4', True), |
| - ('skiabot-mac-10_8-compile-005', '5', True), |
| - ('skiabot-mac-10_8-compile-006', '6', True), |
| - ('skiabot-mac-10_8-compile-007', '7', True), |
| - ('skiabot-mac-10_8-compile-008', '8', True), |
| - ('skiabot-mac-10_8-compile-009', '9', True), |
| - ], |
| - 'copies': DEFAULT_COPIES, |
| + ('skiabot-mac-10_8-compile-000', '0', False), |
| + ('skiabot-mac-10_8-compile-001', '1', False), |
| + ('skiabot-mac-10_8-compile-002', '2', False), |
| + ('skiabot-mac-10_8-compile-003', '3', False), |
| + ('skiabot-mac-10_8-compile-004', '4', False), |
| + ('skiabot-mac-10_8-compile-005', '5', False), |
| + ('skiabot-mac-10_8-compile-006', '6', False), |
| + ('skiabot-mac-10_8-compile-007', '7', False), |
| + ('skiabot-mac-10_8-compile-008', '8', False), |
| + ('skiabot-mac-10_8-compile-009', '9', False), |
| + ], |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': skia_lab_login, |
| 'ip': '192.168.1.104', |
| 'kvm_num': '7', |
| @@ -800,9 +794,9 @@ _slave_host_dicts = { |
| 'win7-intel-002': { |
| 'slaves': [ |
| - ('skiabot-shuttle-win7-intel-bench', '0', True), |
| + ('skiabot-shuttle-win7-intel-bench', '0', False), |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': None, |
| 'ip': '192.168.1.139', |
| 'kvm_num': 'F', |
| @@ -814,9 +808,9 @@ _slave_host_dicts = { |
| 'win7-intel-003': { |
| 'slaves': [ |
| - ('skiabot-shuttle-win7-intel-000', '0', True), |
| + ('skiabot-shuttle-win7-intel-000', '0', False), |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': None, |
| 'ip': '192.168.1.114', |
| 'kvm_num': 'G', |
| @@ -828,9 +822,9 @@ _slave_host_dicts = { |
| 'win8-gtx660-001': { |
| 'slaves': [ |
| - ('skiabot-shuttle-win8-gtx660-bench', '0', True), |
| + ('skiabot-shuttle-win8-gtx660-bench', '0', False), |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': None, |
| 'ip': '192.168.1.133', |
| 'kvm_num': 'B', |
| @@ -842,9 +836,9 @@ _slave_host_dicts = { |
| 'win8-hd7770-000': { |
| 'slaves': [ |
| - ('skiabot-shuttle-win8-hd7770-000', '0', True), |
| + ('skiabot-shuttle-win8-hd7770-000', '0', False), |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': None, |
| 'ip': '192.168.1.117', |
| 'kvm_num': 'C', |
| @@ -856,9 +850,9 @@ _slave_host_dicts = { |
| 'win8-hd7770-001': { |
| 'slaves': [ |
| - ('skiabot-shuttle-win8-hd7770-bench', '0', True), |
| + ('skiabot-shuttle-win8-hd7770-bench', '0', False), |
| ], |
| - 'copies': DEFAULT_COPIES, |
| + 'copies': CHROMEBUILD_COPIES, |
| 'login_cmd': None, |
| 'ip': '192.168.1.107', |
| 'kvm_num': 'D', |
| @@ -872,7 +866,7 @@ _slave_host_dicts = { |
| 'build3-a3': { |
| 'slaves': [ |
| - ('build3-a3', '0', True), |
| + ('build3-a3', '0', False), |
| ], |
| 'copies': None, |
| 'login_cmd': None, |
| @@ -886,7 +880,7 @@ _slave_host_dicts = { |
| 'build4-a3': { |
| 'slaves': [ |
| - ('build4-a3', '0', True), |
| + ('build4-a3', '0', False), |
| ], |
| 'copies': None, |
| 'login_cmd': None, |
| @@ -900,7 +894,7 @@ _slave_host_dicts = { |
| 'build5-a3': { |
| 'slaves': [ |
| - ('build5-a3', '0', True), |
| + ('build5-a3', '0', False), |
| ], |
| 'copies': None, |
| 'login_cmd': None, |
| @@ -917,10 +911,10 @@ _slave_host_dicts = { |
| # them from slaves.cfg in case we want to add them back in the future. |
| 'extra_buildslaves_catchall': { |
| 'slaves': [ |
| - ('skiabot-macmini-10_7-002', '2', True), |
| - ('skiabot-macmini-10_7-003', '3', True), |
| - ('skiabot-macmini-10_8-002', '2', True), |
| - ('skiabot-macmini-10_8-003', '3', True), |
| + ('skiabot-macmini-10_7-002', '2', False), |
| + ('skiabot-macmini-10_7-003', '3', False), |
| + ('skiabot-macmini-10_8-002', '2', False), |
| + ('skiabot-macmini-10_8-003', '3', False), |
| ], |
| 'copies': None, |
| 'login_cmd': None, |
| @@ -970,7 +964,7 @@ def default_slave_host_config(hostname): |
| return SlaveHostConfig( |
| hostname=hostname, |
| slaves=[(hostname, '0', True)], |
| - copies=DEFAULT_COPIES, |
| + copies=CHROMEBUILD_COPIES, |
| login_cmd=None, |
| ip=None, |
| kvm_num=None, |