Revert to use simple steps without collecting stdout/stderr.

Change-Id: I1c9f94d6b25307a577682537e0381201c8eedbce
Bug: https://github.com/flutter/flutter/issues/80317
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/12342
Reviewed-by: Christopher Fujino <fujino@google.com>
Commit-Queue: Godofredo Contreras <godofredoc@google.com>

recipes/devicelab/devicelab_drone.expected/basic.json

diff --git a/recipes/devicelab/devicelab_drone.expected/basic.json b/recipes/devicelab/devicelab_drone.expected/basic.json
index 29e413d..f6bf54f 100644
--- a/recipes/devicelab/devicelab_drone.expected/basic.json
+++ b/recipes/devicelab/devicelab_drone.expected/basic.json
@@ -300,13 +300,7 @@
       ]
     },
     "name": "run abc",
-    "timeout": 900,
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@stdout@@@@",
-      "@@@STEP_LOG_END@stdout@@@",
-      "@@@STEP_LOG_LINE@stderr@@@@",
-      "@@@STEP_LOG_END@stderr@@@"
-    ]
+    "timeout": 900
   },
   {
     "cmd": [],

recipes/devicelab/devicelab_drone.expected/post-submit.json

diff --git a/recipes/devicelab/devicelab_drone.expected/post-submit.json b/recipes/devicelab/devicelab_drone.expected/post-submit.json
index 21eb35a..b7980c6 100644
--- a/recipes/devicelab/devicelab_drone.expected/post-submit.json
+++ b/recipes/devicelab/devicelab_drone.expected/post-submit.json
@@ -299,13 +299,7 @@
       ]
     },
     "name": "run abc",
-    "timeout": 900,
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@stdout@@@@",
-      "@@@STEP_LOG_END@stdout@@@",
-      "@@@STEP_LOG_LINE@stderr@@@@",
-      "@@@STEP_LOG_END@stderr@@@"
-    ]
+    "timeout": 900
   },
   {
     "cmd": [],

recipes/devicelab/devicelab_drone.expected/upload-metrics-mac.json

diff --git a/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac.json b/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac.json
index 404cae8..e81d454 100644
--- a/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac.json
+++ b/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac.json
@@ -325,13 +325,7 @@
       ]
     },
     "name": "run abc",
-    "timeout": 900,
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@stdout@@@@",
-      "@@@STEP_LOG_END@stdout@@@",
-      "@@@STEP_LOG_LINE@stderr@@@@",
-      "@@@STEP_LOG_END@stderr@@@"
-    ]
+    "timeout": 900
   },
   {
     "cmd": [],

recipes/devicelab/devicelab_drone.expected/xcode-chromium-mac.json

diff --git a/recipes/devicelab/devicelab_drone.expected/xcode-chromium-mac.json b/recipes/devicelab/devicelab_drone.expected/xcode-chromium-mac.json
index f1a871b..49e5441 100644
--- a/recipes/devicelab/devicelab_drone.expected/xcode-chromium-mac.json
+++ b/recipes/devicelab/devicelab_drone.expected/xcode-chromium-mac.json
@@ -325,13 +325,7 @@
       ]
     },
     "name": "run abc",
-    "timeout": 900,
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@stdout@@@@",
-      "@@@STEP_LOG_END@stdout@@@",
-      "@@@STEP_LOG_LINE@stderr@@@@",
-      "@@@STEP_LOG_END@stderr@@@"
-    ]
+    "timeout": 900
   },
   {
     "cmd": [],

recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json

diff --git a/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json b/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json
index f1a871b..49e5441 100644
--- a/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json
+++ b/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json
@@ -325,13 +325,7 @@
       ]
     },
     "name": "run abc",
-    "timeout": 900,
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@stdout@@@@",
-      "@@@STEP_LOG_END@stdout@@@",
-      "@@@STEP_LOG_LINE@stderr@@@@",
-      "@@@STEP_LOG_END@stderr@@@"
-    ]
+    "timeout": 900
   },
   {
     "cmd": [],

recipes/devicelab/devicelab_drone.py

diff --git a/recipes/devicelab/devicelab_drone.py b/recipes/devicelab/devicelab_drone.py
index fc7f81a..ef941ca 100644
--- a/recipes/devicelab/devicelab_drone.py
+++ b/recipes/devicelab/devicelab_drone.py
@@ -86,10 +86,10 @@
         api.step('flutter doctor', ['flutter', 'doctor', '--verbose'])
         test_runner_command = ['dart', 'bin/run.dart']
         test_runner_command.extend(runner_params)
-        api.test_utils.run_test(
+        api.step(
             'run %s' % task_name,
             test_runner_command,
-            timeout_secs=MAX_TIMEOUT_SECS
+            timeout=MAX_TIMEOUT_SECS
         )
         api.logs_util.upload_logs(task_name)
         # This is to clean up leaked processes.
@@ -113,10 +113,10 @@
     api.step('Set execute permission', ['chmod', '755', resource_name])
     test_runner_command = [resource_name]
     test_runner_command.extend(runner_params)
-    api.test_utils.run_test(
+    api.step(
         'run %s' % task_name,
         test_runner_command,
-        timeout_secs=MAX_TIMEOUT_SECS
+        timeout=MAX_TIMEOUT_SECS
     )
     api.logs_util.upload_logs(task_name)
     # This is to clean up leaked processes.