Remove duplicate flake step
An extra flake step was introduced https://flutter-review.googlesource.com/c/recipes/+/54763/7/recipe_modules/test_utils/api.py#162, which is more closer to the flake analysis.
This CL removes the old flake step from recipes files (leaving it with the module file)
Change-Id: I5e7235a612d23b6367b3e3213e0ef9da9f3be158
Bug: https://github.com/flutter/flutter/issues/143463
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/55221
Commit-Queue: Keyong Han <keyonghan@google.com>
Reviewed-by: Ricardo Amador <ricardoamador@google.com>
Reviewed-by: Godofredo Contreras <godofredoc@google.com>
diff --git a/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json b/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json
index 45fe52f..f764c78 100644
--- a/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json
+++ b/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json
@@ -3222,15 +3222,6 @@
},
{
"cmd": [],
- "name": "step is flaky: run abc (2)",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@stdout@@@@",
- "@@@STEP_LOG_END@stdout@@@",
- "@@@STEP_FAILURE@@@"
- ]
- },
- {
- "cmd": [],
"name": "Upload metrics"
},
{
diff --git a/recipes/devicelab/devicelab_drone.py b/recipes/devicelab/devicelab_drone.py
index ac9f922..778d3d4 100644
--- a/recipes/devicelab/devicelab_drone.py
+++ b/recipes/devicelab/devicelab_drone.py
@@ -168,9 +168,6 @@
finally:
debug_after_failure(api, task_name)
- if test_status == 'flaky':
- api.test_utils.flaky_step('run %s' % task_name)
-
with api.context(env=env, env_prefixes=env_prefixes, cwd=devicelab_path):
def _retryUpload():
diff --git a/recipes/devicelab/devicelab_test_drone.expected/basic.json b/recipes/devicelab/devicelab_test_drone.expected/basic.json
index 3121bfe..ccbcccc 100644
--- a/recipes/devicelab/devicelab_test_drone.expected/basic.json
+++ b/recipes/devicelab/devicelab_test_drone.expected/basic.json
@@ -1085,15 +1085,6 @@
},
{
"cmd": [],
- "name": "step is flaky: run abc (2)",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@stdout@@@@",
- "@@@STEP_LOG_END@stdout@@@",
- "@@@STEP_FAILURE@@@"
- ]
- },
- {
- "cmd": [],
"name": "Upload metrics"
},
{
diff --git a/recipes/devicelab/devicelab_test_drone.expected/experimental.json b/recipes/devicelab/devicelab_test_drone.expected/experimental.json
index 16ee5aa..0a3f4d7 100644
--- a/recipes/devicelab/devicelab_test_drone.expected/experimental.json
+++ b/recipes/devicelab/devicelab_test_drone.expected/experimental.json
@@ -1084,15 +1084,6 @@
"name": "OS info (2)"
},
{
- "cmd": [],
- "name": "step is flaky: run abc (2)",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@stdout@@@@",
- "@@@STEP_LOG_END@stdout@@@",
- "@@@STEP_FAILURE@@@"
- ]
- },
- {
"name": "$result"
}
]
\ No newline at end of file
diff --git a/recipes/devicelab/devicelab_test_drone.expected/mac.json b/recipes/devicelab/devicelab_test_drone.expected/mac.json
index 84d9621..a4ee5bd 100644
--- a/recipes/devicelab/devicelab_test_drone.expected/mac.json
+++ b/recipes/devicelab/devicelab_test_drone.expected/mac.json
@@ -2045,15 +2045,6 @@
"name": "git xattr info (2)"
},
{
- "cmd": [],
- "name": "step is flaky: run abc (2)",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@stdout@@@@",
- "@@@STEP_LOG_END@stdout@@@",
- "@@@STEP_FAILURE@@@"
- ]
- },
- {
"cmd": [
"sudo",
"xcode-select",
diff --git a/recipes/devicelab/devicelab_test_drone.py b/recipes/devicelab/devicelab_test_drone.py
index bc5b9b7..1c97e34 100644
--- a/recipes/devicelab/devicelab_test_drone.py
+++ b/recipes/devicelab/devicelab_test_drone.py
@@ -155,8 +155,6 @@
)
finally:
debug_after_failure(api, task_name)
- if test_status == 'flaky':
- api.test_utils.flaky_step('run %s' % task_name)
def download_artifact(api, artifact, artifact_destination_dir):
