Don't reboot Pixel C or Nexus Player before task
We reboot this after in swarming with real adb, so this
is unnecessary and could, in fact, be harmful.
Bug: skia:6559
NOTRY=true
Change-Id: Iaf58416994637111c02013fe3c83f4ac92de2a66
Reviewed-on: https://skia-review.googlesource.com/14526
Reviewed-by: Eric Boren <borenet@google.com>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Kevin Lubick <kjlubick@google.com>
diff --git a/infra/bots/recipe_modules/flavor/example.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android.json b/infra/bots/recipe_modules/flavor/example.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android.json
index c0ba40d..3f53165 100644
--- a/infra/bots/recipe_modules/flavor/example.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android.json
+++ b/infra/bots/recipe_modules/flavor/example.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android.json
@@ -139,69 +139,6 @@
{
"cmd": [
"adb",
- "reboot"
- ],
- "cwd": "[START_DIR]/skia",
- "env": {
- "BUILDTYPE": "Debug",
- "CHROME_HEADLESS": "1",
- "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
- },
- "infra_step": true,
- "name": "rebooting device"
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport subprocess\nimport sys\nimport time\n\nkicks = 0\nwhile True:\n\n times = 0\n while times < 30:\n print 'Waiting for the device to be connected and ready.'\n try:\n times += 1\n output = subprocess.check_output(['adb', 'shell',\n 'getprop', 'sys.boot_completed'])\n if '1' in output:\n print 'Connected'\n sys.exit(0)\n except subprocess.CalledProcessError:\n # no device connected/authorized yet\n pass\n time.sleep(5)\n if kicks >= 3:\n break\n print 'Giving the device a \"kick\" by trying to reboot it.'\n kicks += 1\n print subprocess.check_output(['adb', 'reboot'])\n\nprint 'Timed out waiting for device'\nsys.exit(1)\n"
- ],
- "env": {
- "BUILDTYPE": "Debug",
- "CHROME_HEADLESS": "1",
- "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
- },
- "infra_step": true,
- "name": "wait for device",
- "~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@import time@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@kicks = 0@@@",
- "@@@STEP_LOG_LINE@python.inline@while True:@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@ times = 0@@@",
- "@@@STEP_LOG_LINE@python.inline@ while times < 30:@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Waiting for the device to be connected and ready.'@@@",
- "@@@STEP_LOG_LINE@python.inline@ try:@@@",
- "@@@STEP_LOG_LINE@python.inline@ times += 1@@@",
- "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(['adb', 'shell',@@@",
- "@@@STEP_LOG_LINE@python.inline@ 'getprop', 'sys.boot_completed'])@@@",
- "@@@STEP_LOG_LINE@python.inline@ if '1' in output:@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Connected'@@@",
- "@@@STEP_LOG_LINE@python.inline@ sys.exit(0)@@@",
- "@@@STEP_LOG_LINE@python.inline@ except subprocess.CalledProcessError:@@@",
- "@@@STEP_LOG_LINE@python.inline@ # no device connected/authorized yet@@@",
- "@@@STEP_LOG_LINE@python.inline@ pass@@@",
- "@@@STEP_LOG_LINE@python.inline@ time.sleep(5)@@@",
- "@@@STEP_LOG_LINE@python.inline@ if kicks >= 3:@@@",
- "@@@STEP_LOG_LINE@python.inline@ break@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Giving the device a \"kick\" by trying to reboot it.'@@@",
- "@@@STEP_LOG_LINE@python.inline@ kicks += 1@@@",
- "@@@STEP_LOG_LINE@python.inline@ print subprocess.check_output(['adb', 'reboot'])@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@print 'Timed out waiting for device'@@@",
- "@@@STEP_LOG_LINE@python.inline@sys.exit(1)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "adb",
"shell",
"mkdir",
"-p",
diff --git a/infra/bots/recipe_modules/flavor/example.expected/failed_infra_step.json b/infra/bots/recipe_modules/flavor/example.expected/failed_infra_step.json
index 7a2a69b..1b760d3 100644
--- a/infra/bots/recipe_modules/flavor/example.expected/failed_infra_step.json
+++ b/infra/bots/recipe_modules/flavor/example.expected/failed_infra_step.json
@@ -139,69 +139,6 @@
{
"cmd": [
"adb",
- "reboot"
- ],
- "cwd": "[START_DIR]/skia",
- "env": {
- "BUILDTYPE": "Debug",
- "CHROME_HEADLESS": "1",
- "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
- },
- "infra_step": true,
- "name": "rebooting device"
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport subprocess\nimport sys\nimport time\n\nkicks = 0\nwhile True:\n\n times = 0\n while times < 30:\n print 'Waiting for the device to be connected and ready.'\n try:\n times += 1\n output = subprocess.check_output(['adb', 'shell',\n 'getprop', 'sys.boot_completed'])\n if '1' in output:\n print 'Connected'\n sys.exit(0)\n except subprocess.CalledProcessError:\n # no device connected/authorized yet\n pass\n time.sleep(5)\n if kicks >= 3:\n break\n print 'Giving the device a \"kick\" by trying to reboot it.'\n kicks += 1\n print subprocess.check_output(['adb', 'reboot'])\n\nprint 'Timed out waiting for device'\nsys.exit(1)\n"
- ],
- "env": {
- "BUILDTYPE": "Debug",
- "CHROME_HEADLESS": "1",
- "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
- },
- "infra_step": true,
- "name": "wait for device",
- "~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@import time@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@kicks = 0@@@",
- "@@@STEP_LOG_LINE@python.inline@while True:@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@ times = 0@@@",
- "@@@STEP_LOG_LINE@python.inline@ while times < 30:@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Waiting for the device to be connected and ready.'@@@",
- "@@@STEP_LOG_LINE@python.inline@ try:@@@",
- "@@@STEP_LOG_LINE@python.inline@ times += 1@@@",
- "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(['adb', 'shell',@@@",
- "@@@STEP_LOG_LINE@python.inline@ 'getprop', 'sys.boot_completed'])@@@",
- "@@@STEP_LOG_LINE@python.inline@ if '1' in output:@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Connected'@@@",
- "@@@STEP_LOG_LINE@python.inline@ sys.exit(0)@@@",
- "@@@STEP_LOG_LINE@python.inline@ except subprocess.CalledProcessError:@@@",
- "@@@STEP_LOG_LINE@python.inline@ # no device connected/authorized yet@@@",
- "@@@STEP_LOG_LINE@python.inline@ pass@@@",
- "@@@STEP_LOG_LINE@python.inline@ time.sleep(5)@@@",
- "@@@STEP_LOG_LINE@python.inline@ if kicks >= 3:@@@",
- "@@@STEP_LOG_LINE@python.inline@ break@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Giving the device a \"kick\" by trying to reboot it.'@@@",
- "@@@STEP_LOG_LINE@python.inline@ kicks += 1@@@",
- "@@@STEP_LOG_LINE@python.inline@ print subprocess.check_output(['adb', 'reboot'])@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@print 'Timed out waiting for device'@@@",
- "@@@STEP_LOG_LINE@python.inline@sys.exit(1)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "adb",
"shell",
"mkdir",
"-p",
diff --git a/infra/bots/recipe_modules/flavor/example.expected/failed_read_version.json b/infra/bots/recipe_modules/flavor/example.expected/failed_read_version.json
index bf289bd..fd9cdad 100644
--- a/infra/bots/recipe_modules/flavor/example.expected/failed_read_version.json
+++ b/infra/bots/recipe_modules/flavor/example.expected/failed_read_version.json
@@ -139,69 +139,6 @@
{
"cmd": [
"adb",
- "reboot"
- ],
- "cwd": "[START_DIR]/skia",
- "env": {
- "BUILDTYPE": "Debug",
- "CHROME_HEADLESS": "1",
- "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
- },
- "infra_step": true,
- "name": "rebooting device"
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport subprocess\nimport sys\nimport time\n\nkicks = 0\nwhile True:\n\n times = 0\n while times < 30:\n print 'Waiting for the device to be connected and ready.'\n try:\n times += 1\n output = subprocess.check_output(['adb', 'shell',\n 'getprop', 'sys.boot_completed'])\n if '1' in output:\n print 'Connected'\n sys.exit(0)\n except subprocess.CalledProcessError:\n # no device connected/authorized yet\n pass\n time.sleep(5)\n if kicks >= 3:\n break\n print 'Giving the device a \"kick\" by trying to reboot it.'\n kicks += 1\n print subprocess.check_output(['adb', 'reboot'])\n\nprint 'Timed out waiting for device'\nsys.exit(1)\n"
- ],
- "env": {
- "BUILDTYPE": "Debug",
- "CHROME_HEADLESS": "1",
- "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
- },
- "infra_step": true,
- "name": "wait for device",
- "~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@import time@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@kicks = 0@@@",
- "@@@STEP_LOG_LINE@python.inline@while True:@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@ times = 0@@@",
- "@@@STEP_LOG_LINE@python.inline@ while times < 30:@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Waiting for the device to be connected and ready.'@@@",
- "@@@STEP_LOG_LINE@python.inline@ try:@@@",
- "@@@STEP_LOG_LINE@python.inline@ times += 1@@@",
- "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(['adb', 'shell',@@@",
- "@@@STEP_LOG_LINE@python.inline@ 'getprop', 'sys.boot_completed'])@@@",
- "@@@STEP_LOG_LINE@python.inline@ if '1' in output:@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Connected'@@@",
- "@@@STEP_LOG_LINE@python.inline@ sys.exit(0)@@@",
- "@@@STEP_LOG_LINE@python.inline@ except subprocess.CalledProcessError:@@@",
- "@@@STEP_LOG_LINE@python.inline@ # no device connected/authorized yet@@@",
- "@@@STEP_LOG_LINE@python.inline@ pass@@@",
- "@@@STEP_LOG_LINE@python.inline@ time.sleep(5)@@@",
- "@@@STEP_LOG_LINE@python.inline@ if kicks >= 3:@@@",
- "@@@STEP_LOG_LINE@python.inline@ break@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Giving the device a \"kick\" by trying to reboot it.'@@@",
- "@@@STEP_LOG_LINE@python.inline@ kicks += 1@@@",
- "@@@STEP_LOG_LINE@python.inline@ print subprocess.check_output(['adb', 'reboot'])@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@print 'Timed out waiting for device'@@@",
- "@@@STEP_LOG_LINE@python.inline@sys.exit(1)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "adb",
"shell",
"mkdir",
"-p",
diff --git a/infra/bots/recipe_modules/flavor/gn_android_flavor.py b/infra/bots/recipe_modules/flavor/gn_android_flavor.py
index 318915a..095a82c 100644
--- a/infra/bots/recipe_modules/flavor/gn_android_flavor.py
+++ b/infra/bots/recipe_modules/flavor/gn_android_flavor.py
@@ -39,42 +39,6 @@
kwargs['infra_step'] = True
return self._run(title, 'adb', *cmd, **kwargs)
- # Waits for an android device to be available
- def _wait_for_device(self):
- self.m.run(self.m.python.inline, 'wait for device', program="""
- import subprocess
- import sys
- import time
-
- kicks = 0
- while True:
-
- times = 0
- while times < 30:
- print 'Waiting for the device to be connected and ready.'
- try:
- times += 1
- output = subprocess.check_output(['adb', 'shell',
- 'getprop', 'sys.boot_completed'])
- if '1' in output:
- print 'Connected'
- sys.exit(0)
- except subprocess.CalledProcessError:
- # no device connected/authorized yet
- pass
- time.sleep(5)
- if kicks >= 3:
- break
- print 'Giving the device a "kick" by trying to reboot it.'
- kicks += 1
- print subprocess.check_output(['adb', 'reboot'])
-
- print 'Timed out waiting for device'
- sys.exit(1)
- """,
- infra_step=True)
-
-
def compile(self, unused_target):
compiler = self.m.vars.builder_cfg.get('compiler')
configuration = self.m.vars.builder_cfg.get('configuration')
@@ -121,10 +85,6 @@
self._run('ninja', ninja, '-C', self.out_dir)
def install(self):
- reboot_always = ['NexusPlayer', 'PixelC']
- if self.m.vars.builder_cfg.get('model') in reboot_always:
- self._adb('rebooting device', 'reboot')
- self._wait_for_device()
self._adb('mkdir ' + self.device_dirs.resource_dir,
'shell', 'mkdir', '-p', self.device_dirs.resource_dir)
diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android.json
index bdead3e..e997bf6 100644
--- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android.json
+++ b/infra/bots/recipes/perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android.json
@@ -2,69 +2,6 @@
{
"cmd": [
"adb",
- "reboot"
- ],
- "cwd": "[START_DIR]/skia",
- "env": {
- "BUILDTYPE": "Release",
- "CHROME_HEADLESS": "1",
- "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
- },
- "infra_step": true,
- "name": "rebooting device"
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport subprocess\nimport sys\nimport time\n\nkicks = 0\nwhile True:\n\n times = 0\n while times < 30:\n print 'Waiting for the device to be connected and ready.'\n try:\n times += 1\n output = subprocess.check_output(['adb', 'shell',\n 'getprop', 'sys.boot_completed'])\n if '1' in output:\n print 'Connected'\n sys.exit(0)\n except subprocess.CalledProcessError:\n # no device connected/authorized yet\n pass\n time.sleep(5)\n if kicks >= 3:\n break\n print 'Giving the device a \"kick\" by trying to reboot it.'\n kicks += 1\n print subprocess.check_output(['adb', 'reboot'])\n\nprint 'Timed out waiting for device'\nsys.exit(1)\n"
- ],
- "env": {
- "BUILDTYPE": "Release",
- "CHROME_HEADLESS": "1",
- "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
- },
- "infra_step": true,
- "name": "wait for device",
- "~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@import time@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@kicks = 0@@@",
- "@@@STEP_LOG_LINE@python.inline@while True:@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@ times = 0@@@",
- "@@@STEP_LOG_LINE@python.inline@ while times < 30:@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Waiting for the device to be connected and ready.'@@@",
- "@@@STEP_LOG_LINE@python.inline@ try:@@@",
- "@@@STEP_LOG_LINE@python.inline@ times += 1@@@",
- "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(['adb', 'shell',@@@",
- "@@@STEP_LOG_LINE@python.inline@ 'getprop', 'sys.boot_completed'])@@@",
- "@@@STEP_LOG_LINE@python.inline@ if '1' in output:@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Connected'@@@",
- "@@@STEP_LOG_LINE@python.inline@ sys.exit(0)@@@",
- "@@@STEP_LOG_LINE@python.inline@ except subprocess.CalledProcessError:@@@",
- "@@@STEP_LOG_LINE@python.inline@ # no device connected/authorized yet@@@",
- "@@@STEP_LOG_LINE@python.inline@ pass@@@",
- "@@@STEP_LOG_LINE@python.inline@ time.sleep(5)@@@",
- "@@@STEP_LOG_LINE@python.inline@ if kicks >= 3:@@@",
- "@@@STEP_LOG_LINE@python.inline@ break@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Giving the device a \"kick\" by trying to reboot it.'@@@",
- "@@@STEP_LOG_LINE@python.inline@ kicks += 1@@@",
- "@@@STEP_LOG_LINE@python.inline@ print subprocess.check_output(['adb', 'reboot'])@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@print 'Timed out waiting for device'@@@",
- "@@@STEP_LOG_LINE@python.inline@sys.exit(1)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "adb",
"shell",
"mkdir",
"-p",
diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan.json
index 953b1f5..c010570 100644
--- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan.json
+++ b/infra/bots/recipes/perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan.json
@@ -2,69 +2,6 @@
{
"cmd": [
"adb",
- "reboot"
- ],
- "cwd": "[START_DIR]/skia",
- "env": {
- "BUILDTYPE": "Release",
- "CHROME_HEADLESS": "1",
- "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
- },
- "infra_step": true,
- "name": "rebooting device"
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport subprocess\nimport sys\nimport time\n\nkicks = 0\nwhile True:\n\n times = 0\n while times < 30:\n print 'Waiting for the device to be connected and ready.'\n try:\n times += 1\n output = subprocess.check_output(['adb', 'shell',\n 'getprop', 'sys.boot_completed'])\n if '1' in output:\n print 'Connected'\n sys.exit(0)\n except subprocess.CalledProcessError:\n # no device connected/authorized yet\n pass\n time.sleep(5)\n if kicks >= 3:\n break\n print 'Giving the device a \"kick\" by trying to reboot it.'\n kicks += 1\n print subprocess.check_output(['adb', 'reboot'])\n\nprint 'Timed out waiting for device'\nsys.exit(1)\n"
- ],
- "env": {
- "BUILDTYPE": "Release",
- "CHROME_HEADLESS": "1",
- "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
- },
- "infra_step": true,
- "name": "wait for device",
- "~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@import time@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@kicks = 0@@@",
- "@@@STEP_LOG_LINE@python.inline@while True:@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@ times = 0@@@",
- "@@@STEP_LOG_LINE@python.inline@ while times < 30:@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Waiting for the device to be connected and ready.'@@@",
- "@@@STEP_LOG_LINE@python.inline@ try:@@@",
- "@@@STEP_LOG_LINE@python.inline@ times += 1@@@",
- "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(['adb', 'shell',@@@",
- "@@@STEP_LOG_LINE@python.inline@ 'getprop', 'sys.boot_completed'])@@@",
- "@@@STEP_LOG_LINE@python.inline@ if '1' in output:@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Connected'@@@",
- "@@@STEP_LOG_LINE@python.inline@ sys.exit(0)@@@",
- "@@@STEP_LOG_LINE@python.inline@ except subprocess.CalledProcessError:@@@",
- "@@@STEP_LOG_LINE@python.inline@ # no device connected/authorized yet@@@",
- "@@@STEP_LOG_LINE@python.inline@ pass@@@",
- "@@@STEP_LOG_LINE@python.inline@ time.sleep(5)@@@",
- "@@@STEP_LOG_LINE@python.inline@ if kicks >= 3:@@@",
- "@@@STEP_LOG_LINE@python.inline@ break@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Giving the device a \"kick\" by trying to reboot it.'@@@",
- "@@@STEP_LOG_LINE@python.inline@ kicks += 1@@@",
- "@@@STEP_LOG_LINE@python.inline@ print subprocess.check_output(['adb', 'reboot'])@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@print 'Timed out waiting for device'@@@",
- "@@@STEP_LOG_LINE@python.inline@sys.exit(1)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "adb",
"shell",
"mkdir",
"-p",
diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android.json
index 619ff01..d3e19cc 100644
--- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android.json
+++ b/infra/bots/recipes/perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android.json
@@ -2,69 +2,6 @@
{
"cmd": [
"adb",
- "reboot"
- ],
- "cwd": "[START_DIR]/skia",
- "env": {
- "BUILDTYPE": "Release",
- "CHROME_HEADLESS": "1",
- "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
- },
- "infra_step": true,
- "name": "rebooting device"
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport subprocess\nimport sys\nimport time\n\nkicks = 0\nwhile True:\n\n times = 0\n while times < 30:\n print 'Waiting for the device to be connected and ready.'\n try:\n times += 1\n output = subprocess.check_output(['adb', 'shell',\n 'getprop', 'sys.boot_completed'])\n if '1' in output:\n print 'Connected'\n sys.exit(0)\n except subprocess.CalledProcessError:\n # no device connected/authorized yet\n pass\n time.sleep(5)\n if kicks >= 3:\n break\n print 'Giving the device a \"kick\" by trying to reboot it.'\n kicks += 1\n print subprocess.check_output(['adb', 'reboot'])\n\nprint 'Timed out waiting for device'\nsys.exit(1)\n"
- ],
- "env": {
- "BUILDTYPE": "Release",
- "CHROME_HEADLESS": "1",
- "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
- },
- "infra_step": true,
- "name": "wait for device",
- "~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@import time@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@kicks = 0@@@",
- "@@@STEP_LOG_LINE@python.inline@while True:@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@ times = 0@@@",
- "@@@STEP_LOG_LINE@python.inline@ while times < 30:@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Waiting for the device to be connected and ready.'@@@",
- "@@@STEP_LOG_LINE@python.inline@ try:@@@",
- "@@@STEP_LOG_LINE@python.inline@ times += 1@@@",
- "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(['adb', 'shell',@@@",
- "@@@STEP_LOG_LINE@python.inline@ 'getprop', 'sys.boot_completed'])@@@",
- "@@@STEP_LOG_LINE@python.inline@ if '1' in output:@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Connected'@@@",
- "@@@STEP_LOG_LINE@python.inline@ sys.exit(0)@@@",
- "@@@STEP_LOG_LINE@python.inline@ except subprocess.CalledProcessError:@@@",
- "@@@STEP_LOG_LINE@python.inline@ # no device connected/authorized yet@@@",
- "@@@STEP_LOG_LINE@python.inline@ pass@@@",
- "@@@STEP_LOG_LINE@python.inline@ time.sleep(5)@@@",
- "@@@STEP_LOG_LINE@python.inline@ if kicks >= 3:@@@",
- "@@@STEP_LOG_LINE@python.inline@ break@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Giving the device a \"kick\" by trying to reboot it.'@@@",
- "@@@STEP_LOG_LINE@python.inline@ kicks += 1@@@",
- "@@@STEP_LOG_LINE@python.inline@ print subprocess.check_output(['adb', 'reboot'])@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@print 'Timed out waiting for device'@@@",
- "@@@STEP_LOG_LINE@python.inline@sys.exit(1)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "adb",
"shell",
"mkdir",
"-p",
diff --git a/infra/bots/recipes/perf.expected/failed_push.json b/infra/bots/recipes/perf.expected/failed_push.json
index 9b12457..ffef9017 100644
--- a/infra/bots/recipes/perf.expected/failed_push.json
+++ b/infra/bots/recipes/perf.expected/failed_push.json
@@ -2,69 +2,6 @@
{
"cmd": [
"adb",
- "reboot"
- ],
- "cwd": "[START_DIR]/skia",
- "env": {
- "BUILDTYPE": "Debug",
- "CHROME_HEADLESS": "1",
- "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
- },
- "infra_step": true,
- "name": "rebooting device"
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport subprocess\nimport sys\nimport time\n\nkicks = 0\nwhile True:\n\n times = 0\n while times < 30:\n print 'Waiting for the device to be connected and ready.'\n try:\n times += 1\n output = subprocess.check_output(['adb', 'shell',\n 'getprop', 'sys.boot_completed'])\n if '1' in output:\n print 'Connected'\n sys.exit(0)\n except subprocess.CalledProcessError:\n # no device connected/authorized yet\n pass\n time.sleep(5)\n if kicks >= 3:\n break\n print 'Giving the device a \"kick\" by trying to reboot it.'\n kicks += 1\n print subprocess.check_output(['adb', 'reboot'])\n\nprint 'Timed out waiting for device'\nsys.exit(1)\n"
- ],
- "env": {
- "BUILDTYPE": "Debug",
- "CHROME_HEADLESS": "1",
- "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
- },
- "infra_step": true,
- "name": "wait for device",
- "~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@import time@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@kicks = 0@@@",
- "@@@STEP_LOG_LINE@python.inline@while True:@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@ times = 0@@@",
- "@@@STEP_LOG_LINE@python.inline@ while times < 30:@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Waiting for the device to be connected and ready.'@@@",
- "@@@STEP_LOG_LINE@python.inline@ try:@@@",
- "@@@STEP_LOG_LINE@python.inline@ times += 1@@@",
- "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(['adb', 'shell',@@@",
- "@@@STEP_LOG_LINE@python.inline@ 'getprop', 'sys.boot_completed'])@@@",
- "@@@STEP_LOG_LINE@python.inline@ if '1' in output:@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Connected'@@@",
- "@@@STEP_LOG_LINE@python.inline@ sys.exit(0)@@@",
- "@@@STEP_LOG_LINE@python.inline@ except subprocess.CalledProcessError:@@@",
- "@@@STEP_LOG_LINE@python.inline@ # no device connected/authorized yet@@@",
- "@@@STEP_LOG_LINE@python.inline@ pass@@@",
- "@@@STEP_LOG_LINE@python.inline@ time.sleep(5)@@@",
- "@@@STEP_LOG_LINE@python.inline@ if kicks >= 3:@@@",
- "@@@STEP_LOG_LINE@python.inline@ break@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Giving the device a \"kick\" by trying to reboot it.'@@@",
- "@@@STEP_LOG_LINE@python.inline@ kicks += 1@@@",
- "@@@STEP_LOG_LINE@python.inline@ print subprocess.check_output(['adb', 'reboot'])@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@print 'Timed out waiting for device'@@@",
- "@@@STEP_LOG_LINE@python.inline@sys.exit(1)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "adb",
"shell",
"mkdir",
"-p",
diff --git a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android_Skpbench.json b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android_Skpbench.json
index 6bacac8..e8864bc 100644
--- a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android_Skpbench.json
+++ b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android_Skpbench.json
@@ -25,69 +25,6 @@
{
"cmd": [
"adb",
- "reboot"
- ],
- "cwd": "[START_DIR]/skia",
- "env": {
- "BUILDTYPE": "Release",
- "CHROME_HEADLESS": "1",
- "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
- },
- "infra_step": true,
- "name": "rebooting device"
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport subprocess\nimport sys\nimport time\n\nkicks = 0\nwhile True:\n\n times = 0\n while times < 30:\n print 'Waiting for the device to be connected and ready.'\n try:\n times += 1\n output = subprocess.check_output(['adb', 'shell',\n 'getprop', 'sys.boot_completed'])\n if '1' in output:\n print 'Connected'\n sys.exit(0)\n except subprocess.CalledProcessError:\n # no device connected/authorized yet\n pass\n time.sleep(5)\n if kicks >= 3:\n break\n print 'Giving the device a \"kick\" by trying to reboot it.'\n kicks += 1\n print subprocess.check_output(['adb', 'reboot'])\n\nprint 'Timed out waiting for device'\nsys.exit(1)\n"
- ],
- "env": {
- "BUILDTYPE": "Release",
- "CHROME_HEADLESS": "1",
- "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
- },
- "infra_step": true,
- "name": "wait for device",
- "~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@import time@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@kicks = 0@@@",
- "@@@STEP_LOG_LINE@python.inline@while True:@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@ times = 0@@@",
- "@@@STEP_LOG_LINE@python.inline@ while times < 30:@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Waiting for the device to be connected and ready.'@@@",
- "@@@STEP_LOG_LINE@python.inline@ try:@@@",
- "@@@STEP_LOG_LINE@python.inline@ times += 1@@@",
- "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(['adb', 'shell',@@@",
- "@@@STEP_LOG_LINE@python.inline@ 'getprop', 'sys.boot_completed'])@@@",
- "@@@STEP_LOG_LINE@python.inline@ if '1' in output:@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Connected'@@@",
- "@@@STEP_LOG_LINE@python.inline@ sys.exit(0)@@@",
- "@@@STEP_LOG_LINE@python.inline@ except subprocess.CalledProcessError:@@@",
- "@@@STEP_LOG_LINE@python.inline@ # no device connected/authorized yet@@@",
- "@@@STEP_LOG_LINE@python.inline@ pass@@@",
- "@@@STEP_LOG_LINE@python.inline@ time.sleep(5)@@@",
- "@@@STEP_LOG_LINE@python.inline@ if kicks >= 3:@@@",
- "@@@STEP_LOG_LINE@python.inline@ break@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Giving the device a \"kick\" by trying to reboot it.'@@@",
- "@@@STEP_LOG_LINE@python.inline@ kicks += 1@@@",
- "@@@STEP_LOG_LINE@python.inline@ print subprocess.check_output(['adb', 'reboot'])@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@print 'Timed out waiting for device'@@@",
- "@@@STEP_LOG_LINE@python.inline@sys.exit(1)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "adb",
"shell",
"mkdir",
"-p",
diff --git a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android_Vulkan_Skpbench.json b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android_Vulkan_Skpbench.json
index 2ef9d5e..79ddb57 100644
--- a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android_Vulkan_Skpbench.json
+++ b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android_Vulkan_Skpbench.json
@@ -25,69 +25,6 @@
{
"cmd": [
"adb",
- "reboot"
- ],
- "cwd": "[START_DIR]/skia",
- "env": {
- "BUILDTYPE": "Release",
- "CHROME_HEADLESS": "1",
- "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
- },
- "infra_step": true,
- "name": "rebooting device"
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport subprocess\nimport sys\nimport time\n\nkicks = 0\nwhile True:\n\n times = 0\n while times < 30:\n print 'Waiting for the device to be connected and ready.'\n try:\n times += 1\n output = subprocess.check_output(['adb', 'shell',\n 'getprop', 'sys.boot_completed'])\n if '1' in output:\n print 'Connected'\n sys.exit(0)\n except subprocess.CalledProcessError:\n # no device connected/authorized yet\n pass\n time.sleep(5)\n if kicks >= 3:\n break\n print 'Giving the device a \"kick\" by trying to reboot it.'\n kicks += 1\n print subprocess.check_output(['adb', 'reboot'])\n\nprint 'Timed out waiting for device'\nsys.exit(1)\n"
- ],
- "env": {
- "BUILDTYPE": "Release",
- "CHROME_HEADLESS": "1",
- "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
- },
- "infra_step": true,
- "name": "wait for device",
- "~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@import time@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@kicks = 0@@@",
- "@@@STEP_LOG_LINE@python.inline@while True:@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@ times = 0@@@",
- "@@@STEP_LOG_LINE@python.inline@ while times < 30:@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Waiting for the device to be connected and ready.'@@@",
- "@@@STEP_LOG_LINE@python.inline@ try:@@@",
- "@@@STEP_LOG_LINE@python.inline@ times += 1@@@",
- "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(['adb', 'shell',@@@",
- "@@@STEP_LOG_LINE@python.inline@ 'getprop', 'sys.boot_completed'])@@@",
- "@@@STEP_LOG_LINE@python.inline@ if '1' in output:@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Connected'@@@",
- "@@@STEP_LOG_LINE@python.inline@ sys.exit(0)@@@",
- "@@@STEP_LOG_LINE@python.inline@ except subprocess.CalledProcessError:@@@",
- "@@@STEP_LOG_LINE@python.inline@ # no device connected/authorized yet@@@",
- "@@@STEP_LOG_LINE@python.inline@ pass@@@",
- "@@@STEP_LOG_LINE@python.inline@ time.sleep(5)@@@",
- "@@@STEP_LOG_LINE@python.inline@ if kicks >= 3:@@@",
- "@@@STEP_LOG_LINE@python.inline@ break@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Giving the device a \"kick\" by trying to reboot it.'@@@",
- "@@@STEP_LOG_LINE@python.inline@ kicks += 1@@@",
- "@@@STEP_LOG_LINE@python.inline@ print subprocess.check_output(['adb', 'reboot'])@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@print 'Timed out waiting for device'@@@",
- "@@@STEP_LOG_LINE@python.inline@sys.exit(1)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "adb",
"shell",
"mkdir",
"-p",
diff --git a/infra/bots/recipes/skpbench.expected/trybot.json b/infra/bots/recipes/skpbench.expected/trybot.json
index 463ffd5..d1fdff7 100644
--- a/infra/bots/recipes/skpbench.expected/trybot.json
+++ b/infra/bots/recipes/skpbench.expected/trybot.json
@@ -25,69 +25,6 @@
{
"cmd": [
"adb",
- "reboot"
- ],
- "cwd": "[START_DIR]/skia",
- "env": {
- "BUILDTYPE": "Release",
- "CHROME_HEADLESS": "1",
- "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
- },
- "infra_step": true,
- "name": "rebooting device"
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport subprocess\nimport sys\nimport time\n\nkicks = 0\nwhile True:\n\n times = 0\n while times < 30:\n print 'Waiting for the device to be connected and ready.'\n try:\n times += 1\n output = subprocess.check_output(['adb', 'shell',\n 'getprop', 'sys.boot_completed'])\n if '1' in output:\n print 'Connected'\n sys.exit(0)\n except subprocess.CalledProcessError:\n # no device connected/authorized yet\n pass\n time.sleep(5)\n if kicks >= 3:\n break\n print 'Giving the device a \"kick\" by trying to reboot it.'\n kicks += 1\n print subprocess.check_output(['adb', 'reboot'])\n\nprint 'Timed out waiting for device'\nsys.exit(1)\n"
- ],
- "env": {
- "BUILDTYPE": "Release",
- "CHROME_HEADLESS": "1",
- "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
- },
- "infra_step": true,
- "name": "wait for device",
- "~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@import time@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@kicks = 0@@@",
- "@@@STEP_LOG_LINE@python.inline@while True:@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@ times = 0@@@",
- "@@@STEP_LOG_LINE@python.inline@ while times < 30:@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Waiting for the device to be connected and ready.'@@@",
- "@@@STEP_LOG_LINE@python.inline@ try:@@@",
- "@@@STEP_LOG_LINE@python.inline@ times += 1@@@",
- "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(['adb', 'shell',@@@",
- "@@@STEP_LOG_LINE@python.inline@ 'getprop', 'sys.boot_completed'])@@@",
- "@@@STEP_LOG_LINE@python.inline@ if '1' in output:@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Connected'@@@",
- "@@@STEP_LOG_LINE@python.inline@ sys.exit(0)@@@",
- "@@@STEP_LOG_LINE@python.inline@ except subprocess.CalledProcessError:@@@",
- "@@@STEP_LOG_LINE@python.inline@ # no device connected/authorized yet@@@",
- "@@@STEP_LOG_LINE@python.inline@ pass@@@",
- "@@@STEP_LOG_LINE@python.inline@ time.sleep(5)@@@",
- "@@@STEP_LOG_LINE@python.inline@ if kicks >= 3:@@@",
- "@@@STEP_LOG_LINE@python.inline@ break@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Giving the device a \"kick\" by trying to reboot it.'@@@",
- "@@@STEP_LOG_LINE@python.inline@ kicks += 1@@@",
- "@@@STEP_LOG_LINE@python.inline@ print subprocess.check_output(['adb', 'reboot'])@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@print 'Timed out waiting for device'@@@",
- "@@@STEP_LOG_LINE@python.inline@sys.exit(1)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "adb",
"shell",
"mkdir",
"-p",
diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-CPU-SSE4-x86-Release-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-CPU-SSE4-x86-Release-Android.json
index fd78e87..ca4470b 100644
--- a/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-CPU-SSE4-x86-Release-Android.json
+++ b/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-CPU-SSE4-x86-Release-Android.json
@@ -2,69 +2,6 @@
{
"cmd": [
"adb",
- "reboot"
- ],
- "cwd": "[START_DIR]/skia",
- "env": {
- "BUILDTYPE": "Release",
- "CHROME_HEADLESS": "1",
- "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
- },
- "infra_step": true,
- "name": "rebooting device"
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport subprocess\nimport sys\nimport time\n\nkicks = 0\nwhile True:\n\n times = 0\n while times < 30:\n print 'Waiting for the device to be connected and ready.'\n try:\n times += 1\n output = subprocess.check_output(['adb', 'shell',\n 'getprop', 'sys.boot_completed'])\n if '1' in output:\n print 'Connected'\n sys.exit(0)\n except subprocess.CalledProcessError:\n # no device connected/authorized yet\n pass\n time.sleep(5)\n if kicks >= 3:\n break\n print 'Giving the device a \"kick\" by trying to reboot it.'\n kicks += 1\n print subprocess.check_output(['adb', 'reboot'])\n\nprint 'Timed out waiting for device'\nsys.exit(1)\n"
- ],
- "env": {
- "BUILDTYPE": "Release",
- "CHROME_HEADLESS": "1",
- "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
- },
- "infra_step": true,
- "name": "wait for device",
- "~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@import time@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@kicks = 0@@@",
- "@@@STEP_LOG_LINE@python.inline@while True:@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@ times = 0@@@",
- "@@@STEP_LOG_LINE@python.inline@ while times < 30:@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Waiting for the device to be connected and ready.'@@@",
- "@@@STEP_LOG_LINE@python.inline@ try:@@@",
- "@@@STEP_LOG_LINE@python.inline@ times += 1@@@",
- "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(['adb', 'shell',@@@",
- "@@@STEP_LOG_LINE@python.inline@ 'getprop', 'sys.boot_completed'])@@@",
- "@@@STEP_LOG_LINE@python.inline@ if '1' in output:@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Connected'@@@",
- "@@@STEP_LOG_LINE@python.inline@ sys.exit(0)@@@",
- "@@@STEP_LOG_LINE@python.inline@ except subprocess.CalledProcessError:@@@",
- "@@@STEP_LOG_LINE@python.inline@ # no device connected/authorized yet@@@",
- "@@@STEP_LOG_LINE@python.inline@ pass@@@",
- "@@@STEP_LOG_LINE@python.inline@ time.sleep(5)@@@",
- "@@@STEP_LOG_LINE@python.inline@ if kicks >= 3:@@@",
- "@@@STEP_LOG_LINE@python.inline@ break@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Giving the device a \"kick\" by trying to reboot it.'@@@",
- "@@@STEP_LOG_LINE@python.inline@ kicks += 1@@@",
- "@@@STEP_LOG_LINE@python.inline@ print subprocess.check_output(['adb', 'reboot'])@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@print 'Timed out waiting for device'@@@",
- "@@@STEP_LOG_LINE@python.inline@sys.exit(1)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "adb",
"shell",
"mkdir",
"-p",
diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan.json b/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan.json
index 083d4fe..13031db 100644
--- a/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan.json
+++ b/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan.json
@@ -2,69 +2,6 @@
{
"cmd": [
"adb",
- "reboot"
- ],
- "cwd": "[START_DIR]/skia",
- "env": {
- "BUILDTYPE": "Release",
- "CHROME_HEADLESS": "1",
- "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
- },
- "infra_step": true,
- "name": "rebooting device"
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport subprocess\nimport sys\nimport time\n\nkicks = 0\nwhile True:\n\n times = 0\n while times < 30:\n print 'Waiting for the device to be connected and ready.'\n try:\n times += 1\n output = subprocess.check_output(['adb', 'shell',\n 'getprop', 'sys.boot_completed'])\n if '1' in output:\n print 'Connected'\n sys.exit(0)\n except subprocess.CalledProcessError:\n # no device connected/authorized yet\n pass\n time.sleep(5)\n if kicks >= 3:\n break\n print 'Giving the device a \"kick\" by trying to reboot it.'\n kicks += 1\n print subprocess.check_output(['adb', 'reboot'])\n\nprint 'Timed out waiting for device'\nsys.exit(1)\n"
- ],
- "env": {
- "BUILDTYPE": "Release",
- "CHROME_HEADLESS": "1",
- "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
- },
- "infra_step": true,
- "name": "wait for device",
- "~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@import time@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@kicks = 0@@@",
- "@@@STEP_LOG_LINE@python.inline@while True:@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@ times = 0@@@",
- "@@@STEP_LOG_LINE@python.inline@ while times < 30:@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Waiting for the device to be connected and ready.'@@@",
- "@@@STEP_LOG_LINE@python.inline@ try:@@@",
- "@@@STEP_LOG_LINE@python.inline@ times += 1@@@",
- "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(['adb', 'shell',@@@",
- "@@@STEP_LOG_LINE@python.inline@ 'getprop', 'sys.boot_completed'])@@@",
- "@@@STEP_LOG_LINE@python.inline@ if '1' in output:@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Connected'@@@",
- "@@@STEP_LOG_LINE@python.inline@ sys.exit(0)@@@",
- "@@@STEP_LOG_LINE@python.inline@ except subprocess.CalledProcessError:@@@",
- "@@@STEP_LOG_LINE@python.inline@ # no device connected/authorized yet@@@",
- "@@@STEP_LOG_LINE@python.inline@ pass@@@",
- "@@@STEP_LOG_LINE@python.inline@ time.sleep(5)@@@",
- "@@@STEP_LOG_LINE@python.inline@ if kicks >= 3:@@@",
- "@@@STEP_LOG_LINE@python.inline@ break@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Giving the device a \"kick\" by trying to reboot it.'@@@",
- "@@@STEP_LOG_LINE@python.inline@ kicks += 1@@@",
- "@@@STEP_LOG_LINE@python.inline@ print subprocess.check_output(['adb', 'reboot'])@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@print 'Timed out waiting for device'@@@",
- "@@@STEP_LOG_LINE@python.inline@sys.exit(1)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "adb",
"shell",
"mkdir",
"-p",
diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Debug-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Debug-Android.json
index 5e916ba..c660538 100644
--- a/infra/bots/recipes/test.expected/Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Debug-Android.json
+++ b/infra/bots/recipes/test.expected/Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Debug-Android.json
@@ -2,69 +2,6 @@
{
"cmd": [
"adb",
- "reboot"
- ],
- "cwd": "[START_DIR]/skia",
- "env": {
- "BUILDTYPE": "Debug",
- "CHROME_HEADLESS": "1",
- "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
- },
- "infra_step": true,
- "name": "rebooting device"
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport subprocess\nimport sys\nimport time\n\nkicks = 0\nwhile True:\n\n times = 0\n while times < 30:\n print 'Waiting for the device to be connected and ready.'\n try:\n times += 1\n output = subprocess.check_output(['adb', 'shell',\n 'getprop', 'sys.boot_completed'])\n if '1' in output:\n print 'Connected'\n sys.exit(0)\n except subprocess.CalledProcessError:\n # no device connected/authorized yet\n pass\n time.sleep(5)\n if kicks >= 3:\n break\n print 'Giving the device a \"kick\" by trying to reboot it.'\n kicks += 1\n print subprocess.check_output(['adb', 'reboot'])\n\nprint 'Timed out waiting for device'\nsys.exit(1)\n"
- ],
- "env": {
- "BUILDTYPE": "Debug",
- "CHROME_HEADLESS": "1",
- "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
- },
- "infra_step": true,
- "name": "wait for device",
- "~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@import time@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@kicks = 0@@@",
- "@@@STEP_LOG_LINE@python.inline@while True:@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@ times = 0@@@",
- "@@@STEP_LOG_LINE@python.inline@ while times < 30:@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Waiting for the device to be connected and ready.'@@@",
- "@@@STEP_LOG_LINE@python.inline@ try:@@@",
- "@@@STEP_LOG_LINE@python.inline@ times += 1@@@",
- "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(['adb', 'shell',@@@",
- "@@@STEP_LOG_LINE@python.inline@ 'getprop', 'sys.boot_completed'])@@@",
- "@@@STEP_LOG_LINE@python.inline@ if '1' in output:@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Connected'@@@",
- "@@@STEP_LOG_LINE@python.inline@ sys.exit(0)@@@",
- "@@@STEP_LOG_LINE@python.inline@ except subprocess.CalledProcessError:@@@",
- "@@@STEP_LOG_LINE@python.inline@ # no device connected/authorized yet@@@",
- "@@@STEP_LOG_LINE@python.inline@ pass@@@",
- "@@@STEP_LOG_LINE@python.inline@ time.sleep(5)@@@",
- "@@@STEP_LOG_LINE@python.inline@ if kicks >= 3:@@@",
- "@@@STEP_LOG_LINE@python.inline@ break@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Giving the device a \"kick\" by trying to reboot it.'@@@",
- "@@@STEP_LOG_LINE@python.inline@ kicks += 1@@@",
- "@@@STEP_LOG_LINE@python.inline@ print subprocess.check_output(['adb', 'reboot'])@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@print 'Timed out waiting for device'@@@",
- "@@@STEP_LOG_LINE@python.inline@sys.exit(1)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "adb",
"shell",
"mkdir",
"-p",
diff --git a/infra/bots/recipes/test.expected/failed_push.json b/infra/bots/recipes/test.expected/failed_push.json
index 9b12457..ffef9017 100644
--- a/infra/bots/recipes/test.expected/failed_push.json
+++ b/infra/bots/recipes/test.expected/failed_push.json
@@ -2,69 +2,6 @@
{
"cmd": [
"adb",
- "reboot"
- ],
- "cwd": "[START_DIR]/skia",
- "env": {
- "BUILDTYPE": "Debug",
- "CHROME_HEADLESS": "1",
- "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
- },
- "infra_step": true,
- "name": "rebooting device"
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport subprocess\nimport sys\nimport time\n\nkicks = 0\nwhile True:\n\n times = 0\n while times < 30:\n print 'Waiting for the device to be connected and ready.'\n try:\n times += 1\n output = subprocess.check_output(['adb', 'shell',\n 'getprop', 'sys.boot_completed'])\n if '1' in output:\n print 'Connected'\n sys.exit(0)\n except subprocess.CalledProcessError:\n # no device connected/authorized yet\n pass\n time.sleep(5)\n if kicks >= 3:\n break\n print 'Giving the device a \"kick\" by trying to reboot it.'\n kicks += 1\n print subprocess.check_output(['adb', 'reboot'])\n\nprint 'Timed out waiting for device'\nsys.exit(1)\n"
- ],
- "env": {
- "BUILDTYPE": "Debug",
- "CHROME_HEADLESS": "1",
- "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[START_DIR]/out"
- },
- "infra_step": true,
- "name": "wait for device",
- "~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@import time@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@kicks = 0@@@",
- "@@@STEP_LOG_LINE@python.inline@while True:@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@ times = 0@@@",
- "@@@STEP_LOG_LINE@python.inline@ while times < 30:@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Waiting for the device to be connected and ready.'@@@",
- "@@@STEP_LOG_LINE@python.inline@ try:@@@",
- "@@@STEP_LOG_LINE@python.inline@ times += 1@@@",
- "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(['adb', 'shell',@@@",
- "@@@STEP_LOG_LINE@python.inline@ 'getprop', 'sys.boot_completed'])@@@",
- "@@@STEP_LOG_LINE@python.inline@ if '1' in output:@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Connected'@@@",
- "@@@STEP_LOG_LINE@python.inline@ sys.exit(0)@@@",
- "@@@STEP_LOG_LINE@python.inline@ except subprocess.CalledProcessError:@@@",
- "@@@STEP_LOG_LINE@python.inline@ # no device connected/authorized yet@@@",
- "@@@STEP_LOG_LINE@python.inline@ pass@@@",
- "@@@STEP_LOG_LINE@python.inline@ time.sleep(5)@@@",
- "@@@STEP_LOG_LINE@python.inline@ if kicks >= 3:@@@",
- "@@@STEP_LOG_LINE@python.inline@ break@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Giving the device a \"kick\" by trying to reboot it.'@@@",
- "@@@STEP_LOG_LINE@python.inline@ kicks += 1@@@",
- "@@@STEP_LOG_LINE@python.inline@ print subprocess.check_output(['adb', 'reboot'])@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@print 'Timed out waiting for device'@@@",
- "@@@STEP_LOG_LINE@python.inline@sys.exit(1)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "adb",
"shell",
"mkdir",
"-p",