aboutsummaryrefslogtreecommitdiffhomepage
path: root/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json
diff options
context:
space:
mode:
Diffstat (limited to 'infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json')
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json136
1 files changed, 75 insertions, 61 deletions
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json
index 4eeaaba070..a0bde750f5 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json
@@ -1,14 +1,28 @@
[
{
"cmd": [
- "/usr/bin/adb.1.0.35",
+ "python",
+ "-u",
+ "import os\nprint os.environ.get('SWARMING_BOT_ID', '')\n"
+ ],
+ "name": "get swarming bot id",
+ "stdout": "/path/to/tmp/",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@python.inline@import os@@@",
+ "@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_BOT_ID', '')@@@",
+ "@@@STEP_LOG_END@python.inline@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "/opt/infra-android/tools/adb",
"push",
"file.txt",
"file.txt"
],
"cwd": "[START_DIR]/skia",
"env": {
- "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -45,7 +59,7 @@
},
{
"cmd": [
- "/usr/bin/adb.1.0.35",
+ "/opt/infra-android/tools/adb",
"shell",
"rm",
"-rf",
@@ -53,7 +67,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
- "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -62,7 +76,7 @@
},
{
"cmd": [
- "/usr/bin/adb.1.0.35",
+ "/opt/infra-android/tools/adb",
"shell",
"mkdir",
"-p",
@@ -70,7 +84,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
- "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -79,7 +93,7 @@
},
{
"cmd": [
- "/usr/bin/adb.1.0.35",
+ "/opt/infra-android/tools/adb",
"shell",
"mkdir",
"-p",
@@ -87,7 +101,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
- "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -98,7 +112,7 @@
"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(['/usr/bin/adb.1.0.35', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n",
+ "\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(['/opt/infra-android/tools/adb', '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"
],
@@ -121,7 +135,7 @@
"@@@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(['/usr/bin/adb.1.0.35', 'push',@@@",
+ "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['/opt/infra-android/tools/adb', '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@@@"
@@ -157,14 +171,14 @@
},
{
"cmd": [
- "/usr/bin/adb.1.0.35",
+ "/opt/infra-android/tools/adb",
"shell",
"cat",
"/sdcard/revenge_of_the_skiabot/SKP_VERSION"
],
"cwd": "[START_DIR]/skia",
"env": {
- "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -174,7 +188,7 @@
},
{
"cmd": [
- "/usr/bin/adb.1.0.35",
+ "/opt/infra-android/tools/adb",
"shell",
"rm",
"-f",
@@ -182,7 +196,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
- "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -191,7 +205,7 @@
},
{
"cmd": [
- "/usr/bin/adb.1.0.35",
+ "/opt/infra-android/tools/adb",
"shell",
"rm",
"-rf",
@@ -199,7 +213,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
- "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -208,7 +222,7 @@
},
{
"cmd": [
- "/usr/bin/adb.1.0.35",
+ "/opt/infra-android/tools/adb",
"shell",
"mkdir",
"-p",
@@ -216,7 +230,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
- "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -227,7 +241,7 @@
"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(['/usr/bin/adb.1.0.35', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n",
+ "\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(['/opt/infra-android/tools/adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n",
"[START_DIR]/skp",
"/sdcard/revenge_of_the_skiabot/skps"
],
@@ -250,7 +264,7 @@
"@@@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(['/usr/bin/adb.1.0.35', 'push',@@@",
+ "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['/opt/infra-android/tools/adb', '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@@@"
@@ -258,14 +272,14 @@
},
{
"cmd": [
- "/usr/bin/adb.1.0.35",
+ "/opt/infra-android/tools/adb",
"push",
"[START_DIR]/tmp/SKP_VERSION",
"/sdcard/revenge_of_the_skiabot/SKP_VERSION"
],
"cwd": "[START_DIR]/skia",
"env": {
- "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -302,14 +316,14 @@
},
{
"cmd": [
- "/usr/bin/adb.1.0.35",
+ "/opt/infra-android/tools/adb",
"shell",
"cat",
"/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
],
"cwd": "[START_DIR]/skia",
"env": {
- "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -319,7 +333,7 @@
},
{
"cmd": [
- "/usr/bin/adb.1.0.35",
+ "/opt/infra-android/tools/adb",
"shell",
"rm",
"-f",
@@ -327,7 +341,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
- "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -336,7 +350,7 @@
},
{
"cmd": [
- "/usr/bin/adb.1.0.35",
+ "/opt/infra-android/tools/adb",
"shell",
"rm",
"-rf",
@@ -344,7 +358,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
- "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -353,7 +367,7 @@
},
{
"cmd": [
- "/usr/bin/adb.1.0.35",
+ "/opt/infra-android/tools/adb",
"shell",
"mkdir",
"-p",
@@ -361,7 +375,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
- "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -372,7 +386,7 @@
"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(['/usr/bin/adb.1.0.35', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n",
+ "\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(['/opt/infra-android/tools/adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n",
"[START_DIR]/skimage",
"/sdcard/revenge_of_the_skiabot/images"
],
@@ -395,7 +409,7 @@
"@@@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(['/usr/bin/adb.1.0.35', 'push',@@@",
+ "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['/opt/infra-android/tools/adb', '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@@@"
@@ -403,14 +417,14 @@
},
{
"cmd": [
- "/usr/bin/adb.1.0.35",
+ "/opt/infra-android/tools/adb",
"push",
"[START_DIR]/tmp/SK_IMAGE_VERSION",
"/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
],
"cwd": "[START_DIR]/skia",
"env": {
- "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -447,14 +461,14 @@
},
{
"cmd": [
- "/usr/bin/adb.1.0.35",
+ "/opt/infra-android/tools/adb",
"shell",
"cat",
"/sdcard/revenge_of_the_skiabot/SVG_VERSION"
],
"cwd": "[START_DIR]/skia",
"env": {
- "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -464,7 +478,7 @@
},
{
"cmd": [
- "/usr/bin/adb.1.0.35",
+ "/opt/infra-android/tools/adb",
"shell",
"rm",
"-f",
@@ -472,7 +486,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
- "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -481,7 +495,7 @@
},
{
"cmd": [
- "/usr/bin/adb.1.0.35",
+ "/opt/infra-android/tools/adb",
"shell",
"rm",
"-rf",
@@ -489,7 +503,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
- "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -498,7 +512,7 @@
},
{
"cmd": [
- "/usr/bin/adb.1.0.35",
+ "/opt/infra-android/tools/adb",
"shell",
"mkdir",
"-p",
@@ -506,7 +520,7 @@
],
"cwd": "[START_DIR]/skia",
"env": {
- "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -517,7 +531,7 @@
"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(['/usr/bin/adb.1.0.35', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n",
+ "\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(['/opt/infra-android/tools/adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n",
"[START_DIR]/svg",
"/sdcard/revenge_of_the_skiabot/svgs"
],
@@ -540,7 +554,7 @@
"@@@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(['/usr/bin/adb.1.0.35', 'push',@@@",
+ "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['/opt/infra-android/tools/adb', '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@@@"
@@ -548,14 +562,14 @@
},
{
"cmd": [
- "/usr/bin/adb.1.0.35",
+ "/opt/infra-android/tools/adb",
"push",
"[START_DIR]/tmp/SVG_VERSION",
"/sdcard/revenge_of_the_skiabot/SVG_VERSION"
],
"cwd": "[START_DIR]/skia",
"env": {
- "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -564,14 +578,14 @@
},
{
"cmd": [
- "/usr/bin/adb.1.0.35",
+ "/opt/infra-android/tools/adb",
"push",
"[START_DIR]/build/dm",
"/data/local/tmp/"
],
"cwd": "[START_DIR]/skia",
"env": {
- "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -594,14 +608,14 @@
},
{
"cmd": [
- "/usr/bin/adb.1.0.35",
+ "/opt/infra-android/tools/adb",
"push",
"[START_DIR]/tmp/dm.sh",
"/data/local/tmp/"
],
"cwd": "[START_DIR]/skia",
"env": {
- "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -610,13 +624,13 @@
},
{
"cmd": [
- "/usr/bin/adb.1.0.35",
+ "/opt/infra-android/tools/adb",
"logcat",
"-c"
],
"cwd": "[START_DIR]/skia",
"env": {
- "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -627,7 +641,7 @@
"cmd": [
"python",
"-u",
- "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/usr/bin/adb.1.0.35', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output(['/usr/bin/adb.1.0.35', 'shell', 'cat',\n bin_dir + 'rc'])))\nexcept ValueError:\n print \"Couldn't read the return code. Probably killed for OOM.\"\n sys.exit(1)\n",
+ "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',\n bin_dir + 'rc'])))\nexcept ValueError:\n print \"Couldn't read the return code. Probably killed for OOM.\"\n sys.exit(1)\n",
"/data/local/tmp/",
"dm.sh"
],
@@ -638,9 +652,9 @@
"@@@STEP_LOG_LINE@python.inline@import sys@@@",
"@@@STEP_LOG_LINE@python.inline@bin_dir = sys.argv[1]@@@",
"@@@STEP_LOG_LINE@python.inline@sh = sys.argv[2]@@@",
- "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(['/usr/bin/adb.1.0.35', 'shell', 'sh', bin_dir + sh])@@@",
+ "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])@@@",
"@@@STEP_LOG_LINE@python.inline@try:@@@",
- "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output(['/usr/bin/adb.1.0.35', 'shell', 'cat',@@@",
+ "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',@@@",
"@@@STEP_LOG_LINE@python.inline@ bin_dir + 'rc'])))@@@",
"@@@STEP_LOG_LINE@python.inline@except ValueError:@@@",
"@@@STEP_LOG_LINE@python.inline@ print \"Couldn't read the return code. Probably killed for OOM.\"@@@",
@@ -654,14 +668,14 @@
},
{
"cmd": [
- "/usr/bin/adb.1.0.35",
+ "/opt/infra-android/tools/adb",
"pull",
"/sdcard/revenge_of_the_skiabot/dm_out",
"[TMP_BASE]/adb_pull_tmp_1"
],
"cwd": "[START_DIR]/skia",
"env": {
- "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -746,7 +760,7 @@
"cmd": [
"python",
"-u",
- "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/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",
+ "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', '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]/build"
],
"env": {
@@ -762,7 +776,7 @@
"@@@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(['/usr/bin/adb.1.0.35', 'logcat', '-d'])@@@",
+ "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/opt/infra-android/tools/adb', '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':@@@",
@@ -777,12 +791,12 @@
},
{
"cmd": [
- "/usr/bin/adb.1.0.35",
+ "/opt/infra-android/tools/adb",
"kill-server"
],
"cwd": "[START_DIR]/skia",
"env": {
- "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey",
+ "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
"CHROME_HEADLESS": "1",
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-31 19:45:43 +0000