diff options
Diffstat (limited to 'infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json')
-rw-r--r-- | infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json | 158 |
1 files changed, 79 insertions, 79 deletions
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json b/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json index 6424e6ea37..38a810ff3f 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.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]" }, @@ -567,7 +581,7 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint log\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([ADB, 'shell', 'echo \"%s\" > '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])\nactual_gov = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", - "/usr/bin/adb.1.0.35", + "/opt/infra-android/tools/adb", "0", "userspace" ], @@ -609,7 +623,7 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ntarget_percent = float(sys.argv[2])\ncpu = int(sys.argv[3])\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint log\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nroot = '/sys/devices/system/cpu/cpu%d/cpufreq' %cpu\n\n# All devices we test on give a list of their available frequencies.\navailable_freqs = subprocess.check_output([ADB, 'shell',\n 'cat %s/scaling_available_frequencies' % root])\n\n# Check for message like '/system/bin/sh: file not found'\nif available_freqs and '/system/bin/sh' not in available_freqs:\n available_freqs = sorted(\n int(i) for i in available_freqs.strip().split())\nelse:\n raise Exception('Could not get list of available frequencies: %s' %\n available_freqs)\n\nmaxfreq = available_freqs[-1]\ntarget = int(round(maxfreq * target_percent))\nfreq = maxfreq\nfor f in reversed(available_freqs):\n if f <= target:\n freq = f\n break\n\nprint 'Setting frequency to %d' % freq\n\n# If scaling_max_freq is lower than our attempted setting, it won't take.\n# We must set min first, because if we try to set max to be less than min\n# (which sometimes happens after certain devices reboot) it returns a\n# perplexing permissions error.\nsubprocess.check_output([ADB, 'shell', 'echo 0 > '\n '%s/scaling_min_freq' % root])\nsubprocess.check_output([ADB, 'shell', 'echo %d > '\n '%s/scaling_max_freq' % (freq, root)])\nsubprocess.check_output([ADB, 'shell', 'echo %d > '\n '%s/scaling_setspeed' % (freq, root)])\ntime.sleep(5)\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '%s/scaling_cur_freq' % root]).strip()\nif actual_freq != str(freq):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_freq, freq))\n", - "/usr/bin/adb.1.0.35", + "/opt/infra-android/tools/adb", "0.6", "0" ], @@ -683,7 +697,7 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint log\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([ADB, 'shell', 'echo \"%s\" > '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])\nactual_gov = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", - "/usr/bin/adb.1.0.35", + "/opt/infra-android/tools/adb", "2", "userspace" ], @@ -725,7 +739,7 @@ "python", "-u", "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ntarget_percent = float(sys.argv[2])\ncpu = int(sys.argv[3])\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint log\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nroot = '/sys/devices/system/cpu/cpu%d/cpufreq' %cpu\n\n# All devices we test on give a list of their available frequencies.\navailable_freqs = subprocess.check_output([ADB, 'shell',\n 'cat %s/scaling_available_frequencies' % root])\n\n# Check for message like '/system/bin/sh: file not found'\nif available_freqs and '/system/bin/sh' not in available_freqs:\n available_freqs = sorted(\n int(i) for i in available_freqs.strip().split())\nelse:\n raise Exception('Could not get list of available frequencies: %s' %\n available_freqs)\n\nmaxfreq = available_freqs[-1]\ntarget = int(round(maxfreq * target_percent))\nfreq = maxfreq\nfor f in reversed(available_freqs):\n if f <= target:\n freq = f\n break\n\nprint 'Setting frequency to %d' % freq\n\n# If scaling_max_freq is lower than our attempted setting, it won't take.\n# We must set min first, because if we try to set max to be less than min\n# (which sometimes happens after certain devices reboot) it returns a\n# perplexing permissions error.\nsubprocess.check_output([ADB, 'shell', 'echo 0 > '\n '%s/scaling_min_freq' % root])\nsubprocess.check_output([ADB, 'shell', 'echo %d > '\n '%s/scaling_max_freq' % (freq, root)])\nsubprocess.check_output([ADB, 'shell', 'echo %d > '\n '%s/scaling_setspeed' % (freq, root)])\ntime.sleep(5)\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '%s/scaling_cur_freq' % root]).strip()\nif actual_freq != str(freq):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_freq, freq))\n", - "/usr/bin/adb.1.0.35", + "/opt/infra-android/tools/adb", "0.6", "2" ], @@ -796,14 +810,14 @@ }, { "cmd": [ - "/usr/bin/adb.1.0.35", + "/opt/infra-android/tools/adb", "push", "[START_DIR]/build/nanobench", "/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]" }, @@ -826,14 +840,14 @@ }, { "cmd": [ - "/usr/bin/adb.1.0.35", + "/opt/infra-android/tools/adb", "push", "[START_DIR]/tmp/nanobench.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]" }, @@ -842,13 +856,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]" }, @@ -859,7 +873,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/", "nanobench.sh" ], @@ -870,9 +884,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.\"@@@", @@ -886,14 +900,14 @@ }, { "cmd": [ - "/usr/bin/adb.1.0.35", + "/opt/infra-android/tools/adb", "pull", "/sdcard/revenge_of_the_skiabot/perf", "[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]" }, @@ -978,7 +992,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": { @@ -995,7 +1009,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':@@@", @@ -1013,20 +1027,6 @@ "cmd": [ "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": [ - "python", - "-u", "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", "--json-output", "/path/to/tmp/json", @@ -1039,12 +1039,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]" }, |