Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(107)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: scripts/slave/recipes/android/perf.expected/provision_devices.json

Issue 2143013002: Revert "[Android] Reland splitting of device recovery and device status." (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 years, 5 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
« no previous file with comments | « scripts/slave/recipes/android/perf.expected/missing_device.json ('k') | scripts/slave/recipes/android/perf.expected/src_side_script_fails.json » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 [ 1 [
2 { 2 {
3 "cmd": [ 3 "cmd": [
4 "python", 4 "python",
5 "-u", 5 "-u",
6 "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", 6 "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
7 "--master", 7 "--master",
8 "chromium.perf", 8 "chromium.perf",
9 "--builder", 9 "--builder",
10 "Android Nexus5 Perf (1)", 10 "Android Nexus5 Perf (1)",
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb" 226 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
227 ], 227 ],
228 "env": { 228 "env": {
229 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json", 229 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
230 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s" 230 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
231 }, 231 },
232 "name": "authorize_adb_devices" 232 "name": "authorize_adb_devices"
233 }, 233 },
234 { 234 {
235 "cmd": [ 235 "cmd": [
236 "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_r ecovery.py", 236 "[SLAVE_BUILD]/src/build/android/buildbot/bb_device_status_check.py",
237 "--adb-path",
238 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
237 "--blacklist-file", 239 "--blacklist-file",
238 "[SLAVE_BUILD]/src/out/bad_devices.json", 240 "[SLAVE_BUILD]/src/out/bad_devices.json",
241 "--json-output",
242 "/path/to/tmp/json",
239 "--known-devices-file", 243 "--known-devices-file",
240 "[HOME]/.android/known_devices.json", 244 "[HOME]/.android/known_devices.json"
241 "--adb-path",
242 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
243 "-v"
244 ], 245 ],
245 "env": { 246 "env": {
246 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json", 247 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
247 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s" 248 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
248 }, 249 },
249 "name": "device_recovery" 250 "name": "device_status_check",
251 "~followup_annotations": [
252 "@@@STEP_TEXT@Online devices: 1@@@",
253 "@@@STEP_LOG_LINE@json.output@[@@@",
254 "@@@STEP_LOG_LINE@json.output@ {@@@",
255 "@@@STEP_LOG_LINE@json.output@ \"adb_status\": \"device\", @@@",
256 "@@@STEP_LOG_LINE@json.output@ \"battery\": {@@@",
257 "@@@STEP_LOG_LINE@json.output@ \"AC powered\": \"false\", @@@",
258 "@@@STEP_LOG_LINE@json.output@ \"USB powered\": \"true\", @@@",
259 "@@@STEP_LOG_LINE@json.output@ \"Wireless powered\": \"false\", @@@",
260 "@@@STEP_LOG_LINE@json.output@ \"health\": \"2\", @@@",
261 "@@@STEP_LOG_LINE@json.output@ \"level\": \"100\", @@@",
262 "@@@STEP_LOG_LINE@json.output@ \"present\": \"true\", @@@",
263 "@@@STEP_LOG_LINE@json.output@ \"scale\": \"100\", @@@",
264 "@@@STEP_LOG_LINE@json.output@ \"status\": \"5\", @@@",
265 "@@@STEP_LOG_LINE@json.output@ \"technology\": \"Li-ion\", @@@",
266 "@@@STEP_LOG_LINE@json.output@ \"temperature\": \"249\", @@@",
267 "@@@STEP_LOG_LINE@json.output@ \"voltage\": \"4286\"@@@",
268 "@@@STEP_LOG_LINE@json.output@ }, @@@",
269 "@@@STEP_LOG_LINE@json.output@ \"blacklisted\": false, @@@",
270 "@@@STEP_LOG_LINE@json.output@ \"build\": \"LRX21O\", @@@",
271 "@@@STEP_LOG_LINE@json.output@ \"build_detail\": \"google/razor/flo:5.0 /LRX21O/1570415:userdebug/dev-keys\", @@@",
272 "@@@STEP_LOG_LINE@json.output@ \"imei_slice\": \"Unknown\", @@@",
273 "@@@STEP_LOG_LINE@json.output@ \"serial\": \"07a00ca4\", @@@",
274 "@@@STEP_LOG_LINE@json.output@ \"type\": \"flo\", @@@",
275 "@@@STEP_LOG_LINE@json.output@ \"usb_status\": true, @@@",
276 "@@@STEP_LOG_LINE@json.output@ \"wifi_ip\": \"\"@@@",
277 "@@@STEP_LOG_LINE@json.output@ }, @@@",
278 "@@@STEP_LOG_LINE@json.output@ {@@@",
279 "@@@STEP_LOG_LINE@json.output@ \"adb_status\": \"offline\", @@@",
280 "@@@STEP_LOG_LINE@json.output@ \"blacklisted\": true, @@@",
281 "@@@STEP_LOG_LINE@json.output@ \"serial\": \"03e0363a003c6ad4\", @@@",
282 "@@@STEP_LOG_LINE@json.output@ \"usb_status\": false@@@",
283 "@@@STEP_LOG_LINE@json.output@ }, @@@",
284 "@@@STEP_LOG_LINE@json.output@ {@@@",
285 "@@@STEP_LOG_LINE@json.output@ \"adb_status\": \"unauthorized\", @@@",
286 "@@@STEP_LOG_LINE@json.output@ \"blacklisted\": true, @@@",
287 "@@@STEP_LOG_LINE@json.output@ \"serial\": \"03e0363a003c6ad5\", @@@",
288 "@@@STEP_LOG_LINE@json.output@ \"usb_status\": true@@@",
289 "@@@STEP_LOG_LINE@json.output@ }, @@@",
290 "@@@STEP_LOG_LINE@json.output@ {@@@",
291 "@@@STEP_LOG_LINE@json.output@ \"adb_status\": \"device\", @@@",
292 "@@@STEP_LOG_LINE@json.output@ \"blacklisted\": true, @@@",
293 "@@@STEP_LOG_LINE@json.output@ \"serial\": \"03e0363a003c6ad6\", @@@",
294 "@@@STEP_LOG_LINE@json.output@ \"usb_status\": true@@@",
295 "@@@STEP_LOG_LINE@json.output@ }@@@",
296 "@@@STEP_LOG_LINE@json.output@]@@@",
297 "@@@STEP_LOG_END@json.output@@@",
298 "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@{@@@",
299 "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"adb_status\": \"device\", @@@",
300 "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"battery\": {@@@",
301 "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"AC powered\": \"false\", @@@",
302 "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"USB powered\": \"true\", @@@",
303 "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"Wireless powered\": \"false\", @@@",
304 "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"health\": \"2\", @@@",
305 "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"level\": \"100\", @@@",
306 "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"present\": \"true\", @@@",
307 "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"scale\": \"100\", @@@",
308 "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"status\": \"5\", @@@",
309 "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"technology\": \"Li-ion\", @@@" ,
310 "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"temperature\": \"249\", @@@",
311 "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"voltage\": \"4286\"@@@",
312 "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ }, @@@",
313 "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"blacklisted\": false, @@@",
314 "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"build\": \"LRX21O\", @@@",
315 "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"build_detail\": \"google/razor/f lo:5.0/LRX21O/1570415:userdebug/dev-keys\", @@@",
316 "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"imei_slice\": \"Unknown\", @@@",
317 "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"serial\": \"07a00ca4\", @@@",
318 "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"type\": \"flo\", @@@",
319 "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"usb_status\": true, @@@",
320 "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@ \"wifi_ip\": \"\"@@@",
321 "@@@STEP_LOG_LINE@flo LRX21O 07a00ca4@}@@@",
322 "@@@STEP_LOG_END@flo LRX21O 07a00ca4@@@",
323 "@@@STEP_LOG_LINE@03e0363a003c6ad4: missing@{@@@",
324 "@@@STEP_LOG_LINE@03e0363a003c6ad4: missing@ \"adb_status\": \"offline\", @@@",
325 "@@@STEP_LOG_LINE@03e0363a003c6ad4: missing@ \"blacklisted\": true, @@@",
326 "@@@STEP_LOG_LINE@03e0363a003c6ad4: missing@ \"serial\": \"03e0363a003c6a d4\", @@@",
327 "@@@STEP_LOG_LINE@03e0363a003c6ad4: missing@ \"usb_status\": false@@@",
328 "@@@STEP_LOG_LINE@03e0363a003c6ad4: missing@}@@@",
329 "@@@STEP_LOG_END@03e0363a003c6ad4: missing@@@",
330 "@@@STEP_LOG_LINE@03e0363a003c6ad5: adb status unauthorized@{@@@",
331 "@@@STEP_LOG_LINE@03e0363a003c6ad5: adb status unauthorized@ \"adb_status \": \"unauthorized\", @@@",
332 "@@@STEP_LOG_LINE@03e0363a003c6ad5: adb status unauthorized@ \"blackliste d\": true, @@@",
333 "@@@STEP_LOG_LINE@03e0363a003c6ad5: adb status unauthorized@ \"serial\": \"03e0363a003c6ad5\", @@@",
334 "@@@STEP_LOG_LINE@03e0363a003c6ad5: adb status unauthorized@ \"usb_status \": true@@@",
335 "@@@STEP_LOG_LINE@03e0363a003c6ad5: adb status unauthorized@}@@@",
336 "@@@STEP_LOG_END@03e0363a003c6ad5: adb status unauthorized@@@",
337 "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@{@@@",
338 "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@ \"adb_status\": \"device \", @@@",
339 "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@ \"blacklisted\": true, @ @@",
340 "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@ \"serial\": \"03e0363a00 3c6ad6\", @@@",
341 "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@ \"usb_status\": true@@@" ,
342 "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@}@@@",
343 "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@"
344 ]
250 }, 345 },
251 { 346 {
252 "cmd": [ 347 "cmd": [
253 "python", 348 "python",
254 "-u", 349 "-u",
255 "[SLAVE_BUILD]/src/build/android/provision_devices.py", 350 "[SLAVE_BUILD]/src/build/android/provision_devices.py",
256 "--adb-path", 351 "--adb-path",
257 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb", 352 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
258 "--blacklist-file", 353 "--blacklist-file",
259 "[SLAVE_BUILD]/src/out/bad_devices.json", 354 "[SLAVE_BUILD]/src/out/bad_devices.json",
(...skipping 18 matching lines...) Expand all
278 "@@@STEP_EXCEPTION@@@" 373 "@@@STEP_EXCEPTION@@@"
279 ] 374 ]
280 }, 375 },
281 { 376 {
282 "name": "$result", 377 "name": "$result",
283 "reason": "Infra Failure: Step('provision_devices') returned 1", 378 "reason": "Infra Failure: Step('provision_devices') returned 1",
284 "recipe_result": null, 379 "recipe_result": null,
285 "status_code": 1 380 "status_code": 1
286 } 381 }
287 ] 382 ]
OLDNEW
« no previous file with comments | « scripts/slave/recipes/android/perf.expected/missing_device.json ('k') | scripts/slave/recipes/android/perf.expected/src_side_script_fails.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698