From aed15a701a317bdbb5a67ac0b497ea28626a9e71 Mon Sep 17 00:00:00 2001 From: Eric Boren Date: Tue, 4 Aug 2020 10:20:37 -0400 Subject: [PATCH] [recipes] Verify that we actually deleted the file/dir on android Bug: skia:10539 Change-Id: I3b51ef8c0106ac439f14a7f0ff61c8b88c7152ff Reviewed-on: https://skia-review.googlesource.com/c/skia/+/305957 Reviewed-by: Ravi Mistry Reviewed-by: Kevin Lubick Commit-Queue: Eric Boren --- infra/bots/recipe_modules/flavor/android.py | 35 +- ...rm-Release-All-Android_SkottieTracing.json | 312 +++++++++++--- ...iG77-arm64-Release-All-Android_Vulkan.json | 312 +++++++++++--- ...-GPU-MaliT880-arm64-Debug-All-Android.json | 312 +++++++++++--- ...CPU-TegraX1-arm64-Release-All-Android.json | 390 +++++++++++++++--- ...GPU-Adreno418-arm64-Debug-All-Android.json | 312 +++++++++++--- ...m64-Release-All-Android_Skpbench_Mskp.json | 156 +++++-- ...PU-Mali400MP2-arm-Release-All-Android.json | 312 +++++++++++--- ...-GPU-MaliT880-arm64-Debug-All-Android.json | 312 +++++++++++--- ...GPU-Adreno418-arm64-Debug-All-Android.json | 312 +++++++++++--- ...eno418-arm64-Release-All-Android_ASAN.json | 312 +++++++++++--- ...eno615-arm64-Debug-All-Android_Vulkan.json | 312 +++++++++++--- .../full.expected/cpu_scale_failed.json | 78 +++- .../full.expected/cpu_scale_failed_golo.json | 78 +++- .../full.expected/cpu_scale_failed_once.json | 312 +++++++++++--- .../full.expected/failed_infra_step.json | 312 +++++++++++--- .../full.expected/failed_read_version.json | 312 +++++++++++--- .../full.expected/retry_adb_command.json | 312 +++++++++++--- .../retry_adb_command_retries_exhausted.json | 78 +++- ...xus7-CPU-Tegra3-arm-Debug-All-Android.json | 312 +++++++++++--- ...rm-Release-All-Android_SkottieTracing.json | 234 +++++++++-- .../skottietracing_parse_trace_error.json | 117 +++++- .../skottietracing_trybot.json | 234 +++++++++-- ...m64-Release-All-Android_CCPR_Skpbench.json | 78 +++- ...m64-Release-All-Android_Skpbench_Mskp.json | 78 +++- .../recipes/skpbench.expected/trybot.json | 78 +++- ...-Adreno530-arm-Debug-All-Android_ASAN.json | 234 +++++++++-- ...GPU-Adreno540-arm64-Debug-All-Android.json | 273 ++++++++++-- 28 files changed, 5510 insertions(+), 999 deletions(-) diff --git a/infra/bots/recipe_modules/flavor/android.py b/infra/bots/recipe_modules/flavor/android.py index 0f1b615990..c36ec6b2b9 100644 --- a/infra/bots/recipe_modules/flavor/android.py +++ b/infra/bots/recipe_modules/flavor/android.py @@ -4,6 +4,7 @@ from recipe_engine import recipe_api +from recipe_engine import recipe_test_api from . import default import subprocess # TODO(borenet): No! Remove this. @@ -83,7 +84,7 @@ class AndroidFlavor(default.DefaultFlavor): self._ever_ran_adb = True # ADB seems to be occasionally flaky on every device, so always retry. - attempts = 3 + attempts = kwargs.pop('attempts', 3) def wait_for_device(attempt): self.m.run(self.m.step, @@ -583,8 +584,36 @@ time.sleep(60) return rv.stdout.rstrip() if rv and rv.stdout else None def remove_file_on_device(self, path): - self._adb('rm %s' % path, 'shell', 'rm', '-f', path) + self.m.run.with_retry(self.m.python.inline, 'rm %s' % path, 3, program=""" + import subprocess + import sys + + # Remove the path. + adb = sys.argv[1] + path = sys.argv[2] + print('Removing %s' % path) + cmd = [adb, 'shell', 'rm', '-rf', path] + print(' '.join(cmd)) + subprocess.check_call(cmd) + + # Verify that the path was deleted. + print('Checking for existence of %s' % path) + cmd = [adb, 'shell', 'stat', path] + print(' '.join(cmd)) + try: + output = subprocess.check_output(cmd, stderr=subprocess.STDOUT) + except subprocess.CalledProcessError as e: + output = e.output + print('Output was:') + print('======') + print(output) + print('======') + if 'No such file or directory' not in output: + raise Exception('%s exists despite being deleted' % path) + """, + args=[self.ADB_BINARY, path], + infra_step=True) def create_clean_device_dir(self, path): - self._adb('rm %s' % path, 'shell', 'rm', '-rf', path) + self.remove_file_on_device(path) self._adb('mkdir %s' % path, 'shell', 'mkdir', '-p', path) diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json index 2659d1632e..8b07763f51 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json @@ -46,20 +46,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "file.txt" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm file.txt" + "name": "rm file.txt", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -91,20 +118,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "device_results_dir" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm device_results_dir" + "name": "rm device_results_dir", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -277,37 +331,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/skps" + "name": "rm /sdcard/revenge_of_the_skiabot/skps", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -479,37 +587,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/images" + "name": "rm /sdcard/revenge_of_the_skiabot/images", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -681,37 +843,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/svgs" + "name": "rm /sdcard/revenge_of_the_skiabot/svgs", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan.json index bcb522a396..ae372b4def 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan.json @@ -46,20 +46,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "file.txt" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm file.txt" + "name": "rm file.txt", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -91,20 +118,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "device_results_dir" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm device_results_dir" + "name": "rm device_results_dir", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -310,37 +364,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/skps" + "name": "rm /sdcard/revenge_of_the_skiabot/skps", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -512,37 +620,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/images" + "name": "rm /sdcard/revenge_of_the_skiabot/images", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -714,37 +876,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/svgs" + "name": "rm /sdcard/revenge_of_the_skiabot/svgs", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json index 1484bdad46..e28d096f8f 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json @@ -46,20 +46,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "file.txt" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm file.txt" + "name": "rm file.txt", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -91,20 +118,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "device_results_dir" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm device_results_dir" + "name": "rm device_results_dir", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -293,37 +347,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/skps" + "name": "rm /sdcard/revenge_of_the_skiabot/skps", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -495,37 +603,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/images" + "name": "rm /sdcard/revenge_of_the_skiabot/images", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -697,37 +859,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/svgs" + "name": "rm /sdcard/revenge_of_the_skiabot/svgs", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-NVIDIA_Shield-CPU-TegraX1-arm64-Release-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-NVIDIA_Shield-CPU-TegraX1-arm64-Release-All-Android.json index 4bf53df725..c1f352e6f4 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-NVIDIA_Shield-CPU-TegraX1-arm64-Release-All-Android.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-NVIDIA_Shield-CPU-TegraX1-arm64-Release-All-Android.json @@ -46,20 +46,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "file.txt" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm file.txt" + "name": "rm file.txt", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -91,20 +118,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "device_results_dir" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm device_results_dir" + "name": "rm device_results_dir", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -210,37 +264,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/TEXTTRACES_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/TEXTTRACES_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/TEXTTRACES_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/text_blob_traces" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/text_blob_traces" + "name": "rm /sdcard/revenge_of_the_skiabot/text_blob_traces", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -495,37 +603,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/skps" + "name": "rm /sdcard/revenge_of_the_skiabot/skps", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -697,37 +859,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/images" + "name": "rm /sdcard/revenge_of_the_skiabot/images", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -899,37 +1115,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/svgs" + "name": "rm /sdcard/revenge_of_the_skiabot/svgs", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json index 2f7ef28a61..95b802024d 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json @@ -46,20 +46,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "file.txt" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm file.txt" + "name": "rm file.txt", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -91,20 +118,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "device_results_dir" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm device_results_dir" + "name": "rm device_results_dir", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -671,37 +725,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/skps" + "name": "rm /sdcard/revenge_of_the_skiabot/skps", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -873,37 +981,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/images" + "name": "rm /sdcard/revenge_of_the_skiabot/images", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -1075,37 +1237,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/svgs" + "name": "rm /sdcard/revenge_of_the_skiabot/svgs", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Skpbench_Mskp.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Skpbench_Mskp.json index 559be8ade4..80e867d650 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Skpbench_Mskp.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Skpbench_Mskp.json @@ -46,20 +46,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "file.txt" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm file.txt" + "name": "rm file.txt", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -91,20 +118,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "device_results_dir" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm device_results_dir" + "name": "rm device_results_dir", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -426,37 +480,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/MSKP_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/MSKP_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/MSKP_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/mskp" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/mskp" + "name": "rm /sdcard/revenge_of_the_skiabot/mskp", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json index ec8d26dd1d..9f3cef598b 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json @@ -46,20 +46,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "file.txt" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm file.txt" + "name": "rm file.txt", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -91,20 +118,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "device_results_dir" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm device_results_dir" + "name": "rm device_results_dir", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -335,37 +389,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/skps" + "name": "rm /sdcard/revenge_of_the_skiabot/skps", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -537,37 +645,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/images" + "name": "rm /sdcard/revenge_of_the_skiabot/images", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -739,37 +901,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/svgs" + "name": "rm /sdcard/revenge_of_the_skiabot/svgs", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ 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 1b7e674294..da5b555382 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 @@ -46,20 +46,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "file.txt" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm file.txt" + "name": "rm file.txt", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -91,20 +118,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "device_results_dir" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm device_results_dir" + "name": "rm device_results_dir", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -293,37 +347,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/skps" + "name": "rm /sdcard/revenge_of_the_skiabot/skps", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -495,37 +603,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/images" + "name": "rm /sdcard/revenge_of_the_skiabot/images", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -697,37 +859,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/svgs" + "name": "rm /sdcard/revenge_of_the_skiabot/svgs", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json index faaa98960d..d8170925c3 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json @@ -46,20 +46,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "file.txt" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm file.txt" + "name": "rm file.txt", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -91,20 +118,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "device_results_dir" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm device_results_dir" + "name": "rm device_results_dir", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -577,37 +631,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/skps" + "name": "rm /sdcard/revenge_of_the_skiabot/skps", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -779,37 +887,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/images" + "name": "rm /sdcard/revenge_of_the_skiabot/images", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -981,37 +1143,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/svgs" + "name": "rm /sdcard/revenge_of_the_skiabot/svgs", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN.json index 8266421472..98f8b2a8fe 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN.json @@ -46,20 +46,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "file.txt" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm file.txt" + "name": "rm file.txt", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -91,20 +118,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "device_results_dir" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm device_results_dir" + "name": "rm device_results_dir", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -667,37 +721,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/skps" + "name": "rm /sdcard/revenge_of_the_skiabot/skps", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -869,37 +977,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/images" + "name": "rm /sdcard/revenge_of_the_skiabot/images", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -1071,37 +1233,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/svgs" + "name": "rm /sdcard/revenge_of_the_skiabot/svgs", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Debug-All-Android_Vulkan.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Debug-All-Android_Vulkan.json index dd40db7a5a..64853cf5b5 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Debug-All-Android_Vulkan.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Debug-All-Android_Vulkan.json @@ -46,20 +46,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "file.txt" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm file.txt" + "name": "rm file.txt", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -91,20 +118,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "device_results_dir" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm device_results_dir" + "name": "rm device_results_dir", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -335,37 +389,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/skps" + "name": "rm /sdcard/revenge_of_the_skiabot/skps", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -537,37 +645,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/images" + "name": "rm /sdcard/revenge_of_the_skiabot/images", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -739,37 +901,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/svgs" + "name": "rm /sdcard/revenge_of_the_skiabot/svgs", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed.json b/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed.json index 2a058c13ab..d6f6b07f1b 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed.json @@ -46,20 +46,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", - "shell", - "rm", - "-f", "file.txt" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm file.txt" + "name": "rm file.txt", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -91,20 +118,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", - "shell", - "rm", - "-rf", "device_results_dir" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm device_results_dir" + "name": "rm device_results_dir", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed_golo.json b/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed_golo.json index 99b7b00e23..965371c378 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed_golo.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed_golo.json @@ -46,20 +46,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "file.txt" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm file.txt" + "name": "rm file.txt", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -91,20 +118,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "device_results_dir" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm device_results_dir" + "name": "rm device_results_dir", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed_once.json b/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed_once.json index 33fed1954a..579542bec5 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed_once.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed_once.json @@ -46,20 +46,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "file.txt" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm file.txt" + "name": "rm file.txt", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -91,20 +118,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "device_results_dir" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm device_results_dir" + "name": "rm device_results_dir", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -746,37 +800,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/skps" + "name": "rm /sdcard/revenge_of_the_skiabot/skps", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -948,37 +1056,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/images" + "name": "rm /sdcard/revenge_of_the_skiabot/images", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -1150,37 +1312,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/svgs" + "name": "rm /sdcard/revenge_of_the_skiabot/svgs", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ 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 7f7e7a2528..04c9e50cce 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 @@ -46,20 +46,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "file.txt" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm file.txt" + "name": "rm file.txt", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -91,20 +118,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "device_results_dir" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm device_results_dir" + "name": "rm device_results_dir", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -671,37 +725,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/skps" + "name": "rm /sdcard/revenge_of_the_skiabot/skps", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -873,37 +981,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/images" + "name": "rm /sdcard/revenge_of_the_skiabot/images", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -1075,37 +1237,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/svgs" + "name": "rm /sdcard/revenge_of_the_skiabot/svgs", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json b/infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json index cc01e1cb50..f966beb530 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json @@ -46,20 +46,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "file.txt" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm file.txt" + "name": "rm file.txt", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -91,20 +118,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "device_results_dir" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm device_results_dir" + "name": "rm device_results_dir", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -671,37 +725,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/skps" + "name": "rm /sdcard/revenge_of_the_skiabot/skps", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -922,37 +1030,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/images" + "name": "rm /sdcard/revenge_of_the_skiabot/images", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -1124,37 +1286,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/svgs" + "name": "rm /sdcard/revenge_of_the_skiabot/svgs", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json index 2ccc832859..e73e1b1a42 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json @@ -46,20 +46,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "file.txt" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm file.txt" + "name": "rm file.txt", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -91,20 +118,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "device_results_dir" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm device_results_dir" + "name": "rm device_results_dir", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -721,37 +775,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/skps" + "name": "rm /sdcard/revenge_of_the_skiabot/skps", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -923,37 +1031,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/images" + "name": "rm /sdcard/revenge_of_the_skiabot/images", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -1125,37 +1287,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/svgs" + "name": "rm /sdcard/revenge_of_the_skiabot/svgs", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command_retries_exhausted.json b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command_retries_exhausted.json index 6445c47b3a..7fdb8c6276 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command_retries_exhausted.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command_retries_exhausted.json @@ -46,20 +46,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "file.txt" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm file.txt" + "name": "rm file.txt", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -91,20 +118,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "device_results_dir" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm device_results_dir" + "name": "rm device_results_dir", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Debug-All-Android.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Debug-All-Android.json index 29ab746224..93a25b82d7 100644 --- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Debug-All-Android.json +++ b/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Debug-All-Android.json @@ -230,37 +230,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/TEXTTRACES_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/TEXTTRACES_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/TEXTTRACES_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/text_blob_traces" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/text_blob_traces" + "name": "rm /sdcard/revenge_of_the_skiabot/text_blob_traces", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -515,37 +569,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/skps" + "name": "rm /sdcard/revenge_of_the_skiabot/skps", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -717,37 +825,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/images" + "name": "rm /sdcard/revenge_of_the_skiabot/images", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -919,37 +1081,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/svgs" + "name": "rm /sdcard/revenge_of_the_skiabot/svgs", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ diff --git a/infra/bots/recipes/perf_skottietrace.expected/Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json b/infra/bots/recipes/perf_skottietrace.expected/Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json index 60c090fbd2..afe13a1da1 100644 --- a/infra/bots/recipes/perf_skottietrace.expected/Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json +++ b/infra/bots/recipes/perf_skottietrace.expected/Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json @@ -239,37 +239,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/LOTTIE_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/LOTTIE_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/LOTTIE_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/lotties" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/lotties" + "name": "rm /sdcard/revenge_of_the_skiabot/lotties", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -389,20 +443,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" + "name": "rm /sdcard/revenge_of_the_skiabot/dm_out", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -613,20 +694,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/dm_out/2.json" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/dm_out/2.json" + "name": "rm /sdcard/revenge_of_the_skiabot/dm_out/2.json", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -800,20 +908,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/dm_out/3.json" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/dm_out/3.json" + "name": "rm /sdcard/revenge_of_the_skiabot/dm_out/3.json", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -987,20 +1122,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/dm_out/4.json" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/dm_out/4.json" + "name": "rm /sdcard/revenge_of_the_skiabot/dm_out/4.json", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ diff --git a/infra/bots/recipes/perf_skottietrace.expected/skottietracing_parse_trace_error.json b/infra/bots/recipes/perf_skottietrace.expected/skottietracing_parse_trace_error.json index 6eb9d68a19..dfac450042 100644 --- a/infra/bots/recipes/perf_skottietrace.expected/skottietracing_parse_trace_error.json +++ b/infra/bots/recipes/perf_skottietrace.expected/skottietracing_parse_trace_error.json @@ -239,37 +239,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/LOTTIE_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/LOTTIE_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/LOTTIE_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/lotties" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/lotties" + "name": "rm /sdcard/revenge_of_the_skiabot/lotties", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -389,20 +443,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" + "name": "rm /sdcard/revenge_of_the_skiabot/dm_out", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ diff --git a/infra/bots/recipes/perf_skottietrace.expected/skottietracing_trybot.json b/infra/bots/recipes/perf_skottietrace.expected/skottietracing_trybot.json index 82f2d1db79..28d76756a8 100644 --- a/infra/bots/recipes/perf_skottietrace.expected/skottietracing_trybot.json +++ b/infra/bots/recipes/perf_skottietrace.expected/skottietracing_trybot.json @@ -239,37 +239,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/LOTTIE_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/LOTTIE_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/LOTTIE_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/lotties" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/lotties" + "name": "rm /sdcard/revenge_of_the_skiabot/lotties", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -389,20 +443,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" + "name": "rm /sdcard/revenge_of_the_skiabot/dm_out", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -613,20 +694,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/dm_out/2.json" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/dm_out/2.json" + "name": "rm /sdcard/revenge_of_the_skiabot/dm_out/2.json", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -800,20 +908,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/dm_out/3.json" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/dm_out/3.json" + "name": "rm /sdcard/revenge_of_the_skiabot/dm_out/3.json", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -987,20 +1122,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/dm_out/4.json" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/dm_out/4.json" + "name": "rm /sdcard/revenge_of_the_skiabot/dm_out/4.json", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ diff --git a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench.json b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench.json index 16e99b565b..c16291ba05 100644 --- a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench.json +++ b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench.json @@ -98,37 +98,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/skps" + "name": "rm /sdcard/revenge_of_the_skiabot/skps", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ diff --git a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Skpbench_Mskp.json b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Skpbench_Mskp.json index 45f0c0b71b..9e54e71027 100644 --- a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Skpbench_Mskp.json +++ b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Skpbench_Mskp.json @@ -98,37 +98,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/MSKP_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/MSKP_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/MSKP_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/mskp" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/mskp" + "name": "rm /sdcard/revenge_of_the_skiabot/mskp", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ diff --git a/infra/bots/recipes/skpbench.expected/trybot.json b/infra/bots/recipes/skpbench.expected/trybot.json index 4dfcac4688..13c0226071 100644 --- a/infra/bots/recipes/skpbench.expected/trybot.json +++ b/infra/bots/recipes/skpbench.expected/trybot.json @@ -98,37 +98,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/skps" + "name": "rm /sdcard/revenge_of_the_skiabot/skps", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm-Debug-All-Android_ASAN.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm-Debug-All-Android_ASAN.json index e1a60bf6a3..8ba136eb92 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm-Debug-All-Android_ASAN.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel-GPU-Adreno530-arm-Debug-All-Android_ASAN.json @@ -471,37 +471,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/skps" + "name": "rm /sdcard/revenge_of_the_skiabot/skps", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -673,37 +727,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/images" + "name": "rm /sdcard/revenge_of_the_skiabot/images", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -875,37 +983,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/svgs" + "name": "rm /sdcard/revenge_of_the_skiabot/svgs", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android.json index b75ad6cf86..f0658d34db 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android.json @@ -481,37 +481,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/skps" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/skps" + "name": "rm /sdcard/revenge_of_the_skiabot/skps", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -683,37 +737,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/images" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/images" + "name": "rm /sdcard/revenge_of_the_skiabot/images", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -885,37 +993,91 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", - "shell", - "rm", - "-f", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION" + "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/svgs" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/svgs" + "name": "rm /sdcard/revenge_of_the_skiabot/svgs", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [ @@ -1063,20 +1225,47 @@ }, { "cmd": [ + "python", + "-u", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'stat', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", - "shell", - "rm", - "-rf", "/sdcard/revenge_of_the_skiabot/dm_out" ], - "cwd": "[START_DIR]/skia", "env": { - "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/adbkey", "CHROME_HEADLESS": "1", "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, - "name": "rm /sdcard/revenge_of_the_skiabot/dm_out" + "name": "rm /sdcard/revenge_of_the_skiabot/dm_out", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", + "@@@STEP_LOG_LINE@python.inline@import sys@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@", + "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@", + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@", + "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@", + "@@@STEP_LOG_LINE@python.inline@@@@", + "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@", + "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@", + "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'stat', path]@@@", + "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", + "@@@STEP_LOG_LINE@python.inline@try:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", + "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", + "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@print(output)@@@", + "@@@STEP_LOG_LINE@python.inline@print('======')@@@", + "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@", + "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s exists despite being deleted' % path)@@@", + "@@@STEP_LOG_END@python.inline@@@" + ] }, { "cmd": [