Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 { | 1 { |
| 2 "Android Arm64 Builder (dbg)": { | 2 "Android Arm64 Builder (dbg)": { |
| 3 "additional_compile_targets": [ | 3 "additional_compile_targets": [ |
| 4 "all" | 4 "all" |
| 5 ] | 5 ] |
| 6 }, | 6 }, |
| 7 "Android Builder": { | 7 "Android Builder": { |
| 8 "additional_compile_targets": [ | 8 "additional_compile_targets": [ |
| 9 "cronet_test_instrumentation_apk", | 9 "cronet_test_instrumentation_apk", |
| 10 "system_webview_apk" | 10 "system_webview_apk" |
| (...skipping 1215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1226 "https://luci-logdog.appspot.com/v/?s", | 1226 "https://luci-logdog.appspot.com/v/?s", |
| 1227 "=android%2Fswarming%2Flogcats%2F", | 1227 "=android%2Fswarming%2Flogcats%2F", |
| 1228 "${TASK_ID}%2F%2B%2Funified_logcats" | 1228 "${TASK_ID}%2F%2B%2Funified_logcats" |
| 1229 ], | 1229 ], |
| 1230 "name": "shard #${SHARD_INDEX} logcats" | 1230 "name": "shard #${SHARD_INDEX} logcats" |
| 1231 } | 1231 } |
| 1232 ] | 1232 ] |
| 1233 }, | 1233 }, |
| 1234 "test": "sandbox_linux_unittests" | 1234 "test": "sandbox_linux_unittests" |
| 1235 }, | 1235 }, |
| 1236 { | 1236 { |
|
jbudorick
2017/06/12 19:47:43
Can you add the following here:
"merge":
| |
| 1237 "swarming": { | |
| 1238 "can_use_on_swarming_builders": true, | |
| 1239 "cipd_packages": [ | |
| 1240 { | |
| 1241 "cipd_package": "infra/tools/luci/logdog/butler/${platform}", | |
| 1242 "location": "bin", | |
| 1243 "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c " | |
| 1244 } | |
| 1245 ], | |
| 1246 "dimension_sets": [ | |
| 1247 { | |
| 1248 "android_devices": "4", | |
| 1249 "device_os": "KTU84P", | |
| 1250 "device_type": "hammerhead" | |
| 1251 } | |
| 1252 ], | |
| 1253 "hard_timeout": 120, | |
| 1254 "output_links": [ | |
| 1255 { | |
| 1256 "link": [ | |
| 1257 "https://luci-logdog.appspot.com/v/?s", | |
| 1258 "=android%2Fswarming%2Flogcats%2F", | |
| 1259 "${TASK_ID}%2F%2B%2Funified_logcats" | |
| 1260 ], | |
| 1261 "name": "shard #${SHARD_INDEX} logcats" | |
| 1262 } | |
| 1263 ] | |
| 1264 }, | |
| 1265 "test": "services_unittests" | |
| 1266 }, | |
| 1267 { | |
| 1237 "merge": { | 1268 "merge": { |
| 1238 "args": [ | 1269 "args": [ |
| 1239 "--bucket", | 1270 "--bucket", |
| 1240 "chromium-result-details", | 1271 "chromium-result-details", |
| 1241 "--test-name", | 1272 "--test-name", |
| 1242 "sql_unittests" | 1273 "sql_unittests" |
| 1243 ], | 1274 ], |
| 1244 "script": "//build/android/pylib/results/presentation/test_results_pre sentation.py" | 1275 "script": "//build/android/pylib/results/presentation/test_results_pre sentation.py" |
| 1245 }, | 1276 }, |
| 1246 "swarming": { | 1277 "swarming": { |
| (...skipping 3935 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 5182 "isolate_name": "telemetry_unittests", | 5213 "isolate_name": "telemetry_unittests", |
| 5183 "name": "telemetry_unittests", | 5214 "name": "telemetry_unittests", |
| 5184 "swarming": { | 5215 "swarming": { |
| 5185 "can_use_on_swarming_builders": true, | 5216 "can_use_on_swarming_builders": true, |
| 5186 "shards": 4 | 5217 "shards": 4 |
| 5187 } | 5218 } |
| 5188 } | 5219 } |
| 5189 ] | 5220 ] |
| 5190 } | 5221 } |
| 5191 } | 5222 } |
| OLD | NEW |