Revert "Temporarily increase doctor timeout to 10 mins."
This reverts commit b962032a7f042c4666e871e2dab57a184e8d1635.
Reason for revert: to add retry back
Original change's description:
> Temporarily increase doctor timeout to 10 mins.
>
> This is to validate the change of router in the lab is working properly.
>
> Change-Id: Icfb80967f2dc15fe769fe1237ca4938184a5f253
> Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/12620
> Commit-Queue: Godofredo Contreras <godofredoc@google.com>
> Reviewed-by: Keyong Han <keyonghan@google.com>
> Reviewed-by: Yusuf Mohsinally <mohsinally@google.com>
TBR=godofredoc@google.com,keyonghan@google.com,flutter-scoped@luci-project-accounts.iam.gserviceaccount.com,mohsinally@google.com
Change-Id: I787541c9a8eac1846f8186f1e343206825e0f094
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/12680
Reviewed-by: Keyong Han <keyonghan@google.com>
Commit-Queue: Keyong Han <keyonghan@google.com>
diff --git a/recipes/devicelab/devicelab_drone.expected/basic.json b/recipes/devicelab/devicelab_drone.expected/basic.json
index 3e7456b..944ff6b 100644
--- a/recipes/devicelab/devicelab_drone.expected/basic.json
+++ b/recipes/devicelab/devicelab_drone.expected/basic.json
@@ -206,7 +206,7 @@
]
},
"name": "flutter doctor",
- "timeout": 600
+ "timeout": 300
},
{
"cmd": [
@@ -264,7 +264,7 @@
]
},
"name": "flutter doctor (2)",
- "timeout": 600
+ "timeout": 300
},
{
"cmd": [
diff --git a/recipes/devicelab/devicelab_drone.expected/post-submit.json b/recipes/devicelab/devicelab_drone.expected/post-submit.json
index 826c745..caf11fd 100644
--- a/recipes/devicelab/devicelab_drone.expected/post-submit.json
+++ b/recipes/devicelab/devicelab_drone.expected/post-submit.json
@@ -207,7 +207,7 @@
]
},
"name": "flutter doctor",
- "timeout": 600
+ "timeout": 300
},
{
"cmd": [
@@ -265,7 +265,7 @@
]
},
"name": "flutter doctor (2)",
- "timeout": 600
+ "timeout": 300
},
{
"cmd": [
diff --git a/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac.json b/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac.json
index bc404f2..8fef4d3 100644
--- a/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac.json
+++ b/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac.json
@@ -207,7 +207,7 @@
]
},
"name": "flutter doctor",
- "timeout": 600
+ "timeout": 300
},
{
"cmd": [
@@ -262,7 +262,7 @@
]
},
"name": "flutter doctor (2)",
- "timeout": 600
+ "timeout": 300
},
{
"cmd": [
diff --git a/recipes/devicelab/devicelab_drone.expected/xcode-chromium-mac.json b/recipes/devicelab/devicelab_drone.expected/xcode-chromium-mac.json
index eafe37f..57c5104 100644
--- a/recipes/devicelab/devicelab_drone.expected/xcode-chromium-mac.json
+++ b/recipes/devicelab/devicelab_drone.expected/xcode-chromium-mac.json
@@ -207,7 +207,7 @@
]
},
"name": "flutter doctor",
- "timeout": 600
+ "timeout": 300
},
{
"cmd": [
@@ -262,7 +262,7 @@
]
},
"name": "flutter doctor (2)",
- "timeout": 600
+ "timeout": 300
},
{
"cmd": [
diff --git a/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json b/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json
index eafe37f..57c5104 100644
--- a/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json
+++ b/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json
@@ -207,7 +207,7 @@
]
},
"name": "flutter doctor",
- "timeout": 600
+ "timeout": 300
},
{
"cmd": [
@@ -262,7 +262,7 @@
]
},
"name": "flutter doctor (2)",
- "timeout": 600
+ "timeout": 300
},
{
"cmd": [
diff --git a/recipes/devicelab/devicelab_drone.py b/recipes/devicelab/devicelab_drone.py
index ce585e5..2c56f3d 100644
--- a/recipes/devicelab/devicelab_drone.py
+++ b/recipes/devicelab/devicelab_drone.py
@@ -66,8 +66,8 @@
api.retry.step(
'flutter doctor',
['flutter', 'doctor'],
- max_attempts=1,
- timeout=600,
+ max_attempts=3,
+ timeout=300,
)
api.step('pub get', ['pub', 'get'], infra_step=True)
dep_list = {d['dependency']: d.get('version') for d in deps}
@@ -89,8 +89,8 @@
api.retry.step(
'flutter doctor',
['flutter', 'doctor', '--verbose'],
- max_attempts=1,
- timeout=600,
+ max_attempts=3,
+ timeout=300,
)
test_runner_command = ['dart', 'bin/test_runner.dart', 'test']
test_runner_command.extend(runner_params)
@@ -112,8 +112,8 @@
)
api.retry.step(
'flutter doctor', ['flutter', 'doctor', '--verbose'],
- max_attempts=1,
- timeout=600
+ max_attempts=3,
+ timeout=300
)
api.os_utils.dismiss_dialogs()
api.os_utils.shutdown_simulators()
