aboutsummaryrefslogtreecommitdiffhomepage
path: root/infra/bots/recipe_modules/flavor/examples
diff options
context:
space:
mode:
authorGravatar Ben Wagner <benjaminwagner@google.com>2017-09-12 12:32:59 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-09-12 17:25:30 +0000
commit79a1256c2233485bd7a4833df02f16655f62fa1c (patch)
tree6c5d7d795f73f4c7f12eaee6ce745d384eb3f3f9 /infra/bots/recipe_modules/flavor/examples
parenta950b63b442f1376d022740457b020ada62f6554 (diff)
Simpler version of wait-for-device.
This is a followup to https://skia-review.googlesource.com/43564 No-Try: true Change-Id: I4bc2a24fe08e6b07f5512e3a1e03eac7e3397155 Reviewed-on: https://skia-review.googlesource.com/45120 Commit-Queue: Ben Wagner <benjaminwagner@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
Diffstat (limited to 'infra/bots/recipe_modules/flavor/examples')
-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
3 files changed, 12 insertions, 140 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": [
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-03 05:15:18 +0000