587afc9df0
The newer adb acts more like cp when pulling. We used to create the dm folder on the host machine before pulling. This used to be fine, /device/dm_out/dm.json -> /host/dm/dm.json However, with the update, adb would do /device/dm_out/dm.json -> /host/dm/dm_out/dm.json This breaks the upload step. To make this transition a smooth one, /usr/bin/adb on the RPI is staying the same (for a while, at least) and /usr/bin/adb.1.0.35 is being added. That way we can use the new adb on tests after this commit, but when we backfill, we don't break because of the unexpected folder. Bug: skia: Change-Id: Icbed38594fca0e17af1f8d01d75c42ce03f710b9 Reviewed-on: https://skia-review.googlesource.com/58880 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com>
130 lines
5.3 KiB
JSON
130 lines
5.3 KiB
JSON
[
|
|
{
|
|
"cmd": [
|
|
"adb.1.0.35",
|
|
"shell",
|
|
"mkdir",
|
|
"-p",
|
|
"/sdcard/revenge_of_the_skiabot/resources"
|
|
],
|
|
"cwd": "[START_DIR]/skia",
|
|
"env": {
|
|
"BUILDTYPE": "Debug",
|
|
"CHROME_HEADLESS": "1",
|
|
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
|
|
"SKIA_OUT": "[START_DIR]/out"
|
|
},
|
|
"infra_step": true,
|
|
"name": "mkdir /sdcard/revenge_of_the_skiabot/resources"
|
|
},
|
|
{
|
|
"cmd": [
|
|
"python",
|
|
"-u",
|
|
"\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb.1.0.35', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n",
|
|
"[START_DIR]/skia/resources",
|
|
"/sdcard/revenge_of_the_skiabot/resources"
|
|
],
|
|
"env": {
|
|
"BUILDTYPE": "Debug",
|
|
"CHROME_HEADLESS": "1",
|
|
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
|
|
"SKIA_OUT": "[START_DIR]/out"
|
|
},
|
|
"infra_step": true,
|
|
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
|
|
"~followup_annotations": [
|
|
"step returned non-zero exit code: 1",
|
|
"@@@STEP_LOG_LINE@python.inline@@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@import os@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@import sys@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@host = sys.argv[1]@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@device = sys.argv[2]@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@for d, _, fs in os.walk(host):@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@ p = os.path.relpath(d, host)@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@ if p != '.' and p.startswith('.'):@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@ continue@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@ for f in fs:@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@ print os.path.join(p,f)@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['adb.1.0.35', 'push',@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@ os.path.realpath(os.path.join(host, p, f)),@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@ os.path.join(device, p, f)])@@@",
|
|
"@@@STEP_LOG_END@python.inline@@@",
|
|
"@@@STEP_EXCEPTION@@@"
|
|
]
|
|
},
|
|
{
|
|
"cmd": [
|
|
"python",
|
|
"-u",
|
|
"\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n",
|
|
"[START_DIR]/out/Debug"
|
|
],
|
|
"env": {
|
|
"BUILDTYPE": "Debug",
|
|
"CHROME_HEADLESS": "1",
|
|
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
|
|
"SKIA_OUT": "[START_DIR]/out"
|
|
},
|
|
"infra_step": true,
|
|
"name": "dump log",
|
|
"timeout": 300,
|
|
"~followup_annotations": [
|
|
"@@@STEP_LOG_LINE@python.inline@@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@import os@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@import sys@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@out = sys.argv[1]@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['adb.1.0.35', 'logcat', '-d'])@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@for line in log.split('\\n'):@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@ tokens = line.split()@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@ if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@ addr, path = tokens[-2:]@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@ local = os.path.join(out, os.path.basename(path))@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@ if os.path.exists(local):@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@ line = line.replace(addr, addr + ' ' + sym.strip())@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@ print line@@@",
|
|
"@@@STEP_LOG_END@python.inline@@@"
|
|
]
|
|
},
|
|
{
|
|
"cmd": [
|
|
"adb.1.0.35",
|
|
"shell",
|
|
"reboot",
|
|
"-p"
|
|
],
|
|
"cwd": "[START_DIR]/skia",
|
|
"env": {
|
|
"BUILDTYPE": "Debug",
|
|
"CHROME_HEADLESS": "1",
|
|
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
|
|
"SKIA_OUT": "[START_DIR]/out"
|
|
},
|
|
"infra_step": true,
|
|
"name": "shut down device to quarantine bot"
|
|
},
|
|
{
|
|
"cmd": [
|
|
"adb.1.0.35",
|
|
"kill-server"
|
|
],
|
|
"cwd": "[START_DIR]/skia",
|
|
"env": {
|
|
"BUILDTYPE": "Debug",
|
|
"CHROME_HEADLESS": "1",
|
|
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
|
|
"SKIA_OUT": "[START_DIR]/out"
|
|
},
|
|
"infra_step": true,
|
|
"name": "kill adb server"
|
|
},
|
|
{
|
|
"name": "$result",
|
|
"reason": "Infra Failure: Step('push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources') returned 1",
|
|
"recipe_result": null,
|
|
"status_code": 1
|
|
}
|
|
] |