aboutsummaryrefslogtreecommitdiffhomepage
path: root/infra/bots
diff options
context:
space:
mode:
Diffstat (limited to 'infra/bots')
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json38
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json38
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command_retries_exhausted.json76
-rw-r--r--infra/bots/recipe_modules/flavor/gn_android_flavor.py33
4 files changed, 14 insertions, 171 deletions
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 c8292117fc..a59ebb4ec2 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
@@ -400,9 +400,8 @@
},
{
"cmd": [
- "python",
- "-u",
- "\nimport subprocess\nimport sys\nimport time\nkicks = 0\nwhile True:\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',\n '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'])\nprint 'Timed out waiting for device'\nsys.exit(1)\n"
+ "adb",
+ "wait-for-device"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -413,38 +412,7 @@
},
"infra_step": true,
"name": "wait for device after failure of 'read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION' (attempt 1)",
- "timeout": 660,
- "~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@kicks = 0@@@",
- "@@@STEP_LOG_LINE@python.inline@while True:@@@",
- "@@@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',@@@",
- "@@@STEP_LOG_LINE@python.inline@ '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@print 'Timed out waiting for device'@@@",
- "@@@STEP_LOG_LINE@python.inline@sys.exit(1)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
+ "timeout": 180
},
{
"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 2f9f937ae8..71fa6bd31c 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
@@ -167,9 +167,8 @@
},
{
"cmd": [
- "python",
- "-u",
- "\nimport subprocess\nimport sys\nimport time\nkicks = 0\nwhile True:\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',\n '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'])\nprint 'Timed out waiting for device'\nsys.exit(1)\n"
+ "adb",
+ "wait-for-device"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -180,38 +179,7 @@
},
"infra_step": true,
"name": "wait for device after failure of 'mkdir /sdcard/revenge_of_the_skiabot/resources' (attempt 1)",
- "timeout": 660,
- "~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@kicks = 0@@@",
- "@@@STEP_LOG_LINE@python.inline@while True:@@@",
- "@@@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',@@@",
- "@@@STEP_LOG_LINE@python.inline@ '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@print 'Timed out waiting for device'@@@",
- "@@@STEP_LOG_LINE@python.inline@sys.exit(1)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
+ "timeout": 180
},
{
"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 830a4e0423..cf66baa576 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
@@ -167,9 +167,8 @@
},
{
"cmd": [
- "python",
- "-u",
- "\nimport subprocess\nimport sys\nimport time\nkicks = 0\nwhile True:\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',\n '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'])\nprint 'Timed out waiting for device'\nsys.exit(1)\n"
+ "adb",
+ "wait-for-device"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -180,38 +179,7 @@
},
"infra_step": true,
"name": "wait for device after failure of 'mkdir /sdcard/revenge_of_the_skiabot/resources' (attempt 1)",
- "timeout": 660,
- "~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@kicks = 0@@@",
- "@@@STEP_LOG_LINE@python.inline@while True:@@@",
- "@@@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',@@@",
- "@@@STEP_LOG_LINE@python.inline@ '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@print 'Timed out waiting for device'@@@",
- "@@@STEP_LOG_LINE@python.inline@sys.exit(1)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
+ "timeout": 180
},
{
"cmd": [
@@ -253,9 +221,8 @@
},
{
"cmd": [
- "python",
- "-u",
- "\nimport subprocess\nimport sys\nimport time\nkicks = 0\nwhile True:\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',\n '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'])\nprint 'Timed out waiting for device'\nsys.exit(1)\n"
+ "adb",
+ "wait-for-device"
],
"cwd": "[START_DIR]/skia",
"env": {
@@ -266,38 +233,7 @@
},
"infra_step": true,
"name": "wait for device after failure of 'mkdir /sdcard/revenge_of_the_skiabot/resources' (attempt 2)",
- "timeout": 660,
- "~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@kicks = 0@@@",
- "@@@STEP_LOG_LINE@python.inline@while True:@@@",
- "@@@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',@@@",
- "@@@STEP_LOG_LINE@python.inline@ '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@print 'Timed out waiting for device'@@@",
- "@@@STEP_LOG_LINE@python.inline@sys.exit(1)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
+ "timeout": 180
},
{
"cmd": [
diff --git a/infra/bots/recipe_modules/flavor/gn_android_flavor.py b/infra/bots/recipe_modules/flavor/gn_android_flavor.py
index 8f48f014da..83da8b794c 100644
--- a/infra/bots/recipe_modules/flavor/gn_android_flavor.py
+++ b/infra/bots/recipe_modules/flavor/gn_android_flavor.py
@@ -51,39 +51,10 @@ class GNAndroidFlavorUtils(default_flavor.DefaultFlavorUtils):
cmd=['adb', 'kill-server'],
infra_step=True, timeout=30, abort_on_failure=False,
fail_build_on_failure=False)
- self.m.run(self.m.python.inline,
+ self.m.run(self.m.step,
'wait for device after failure of \'%s\' (attempt %d)' % (
title, attempt),
- 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, timeout=660,
+ cmd=['adb', 'wait-for-device'], infra_step=True, timeout=180,
abort_on_failure=False, fail_build_on_failure=False)
with self.m.context(cwd=self.m.vars.skia_dir):
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-08 13:05:39 +0000