[dart] Temporarily disable sharded deflaking

The deflaking list is not available on shards so they invariably fail.
Forcing deflaking to run locally will make things work as before.

Change-Id: Id4ecc13da11f2b0f456902cdc144a00f3668aac4
Reviewed-on: https://chromium-review.googlesource.com/c/1459696
Reviewed-by: Alexander Aprelev <aam@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
diff --git a/scripts/slave/recipe_modules/dart/api.py b/scripts/slave/recipe_modules/dart/api.py
index d4fd3e9..e2fec11 100644
--- a/scripts/slave/recipe_modules/dart/api.py
+++ b/scripts/slave/recipe_modules/dart/api.py
@@ -830,6 +830,8 @@
       args = args + ['--repeat=5', '--test-list',
                      self.m.raw_io.input_text(deflake_list)]
       shards = min(shards, 1)
+      # TODO(athom): Remove this hack when sharded deflaking works
+      step.local_shard = True
 
     test_args = ['--progress=status',
                  '--report',
diff --git a/scripts/slave/recipe_modules/dart/examples/example.expected/analyzer-none-linux-release-be.json b/scripts/slave/recipe_modules/dart/examples/example.expected/analyzer-none-linux-release-be.json
index 27a9957..f0a7286 100644
--- a/scripts/slave/recipe_modules/dart/examples/example.expected/analyzer-none-linux-release-be.json
+++ b/scripts/slave/recipe_modules/dart/examples/example.expected/analyzer-none-linux-release-be.json
@@ -2101,91 +2101,10 @@
     ]
   },
   {
-    "cmd": [],
-    "cwd": "[CACHE]/builder/sdk",
-    "name": "deflaking.trigger shards for test1",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
     "cmd": [
       "python",
       "-u",
-      "[CACHE]/builder/sdk/tools/swarming_client/swarming.py",
-      "trigger",
-      "--swarming",
-      "https://chromium-swarm.appspot.com",
-      "--isolate-server",
-      "https://isolateserver.appspot.com",
-      "--priority",
-      "25",
-      "--shards",
-      "1",
-      "--task-name",
-      "test1_shard_1/Linux/test_hash/analyzer-none-linux-release-be/1357",
-      "--dump-json",
-      "/path/to/tmp/json",
-      "--expiration",
-      "3600",
-      "--io-timeout",
-      "1200",
-      "--hard-timeout",
-      "3600",
-      "--dimension",
-      "cpu",
-      "x86-64",
-      "--dimension",
-      "os",
-      "Linux",
-      "--dimension",
-      "pool",
-      "dart.tests",
-      "--named-cache",
-      "swarming_module_cache_vpython",
-      ".swarming_module_cache/vpython",
-      "--tag",
-      "build_is_experimental:false",
-      "--tag",
-      "buildername:analyzer-none-linux-release-be",
-      "--tag",
-      "buildnumber:1357",
-      "--tag",
-      "data:test_hash",
-      "--tag",
-      "name:test1_shard_1",
-      "--tag",
-      "slavename:trusty-dart-123",
-      "--tag",
-      "spec_name:dart.ci:analyzer-none-linux-release-be",
-      "--tag",
-      "stepname:test1_shard_1",
-      "--cipd-package",
-      "tools/sdks:dart/dart-sdk/${platform}:",
-      "--cipd-package",
-      "tests/co19_2/src:dart/third_party/co19:",
-      "--cipd-package",
-      ".swarming_module:infra/python/cpython/${platform}:TEST_VERSION",
-      "--cipd-package",
-      ".swarming_module:infra/tools/luci/logdog/butler/${platform}:TEST_VERSION",
-      "--cipd-package",
-      ".swarming_module:infra/tools/luci/vpython-native/${platform}:TEST_VERSION",
-      "--cipd-package",
-      ".swarming_module:infra/tools/luci/vpython/${platform}:TEST_VERSION",
-      "--env-prefix",
-      "PATH",
-      ".swarming_module",
-      "--env-prefix",
-      "PATH",
-      ".swarming_module/bin",
-      "--env-prefix",
-      "VPYTHON_VIRTUALENV_ROOT",
-      ".swarming_module_cache/vpython",
-      "--isolated",
-      "test_hash",
-      "--raw-cmd",
-      "--",
-      "tools/test.py",
+      "[CACHE]/builder/sdk/tools/test.py",
       "--progress=status",
       "--report",
       "--time",
@@ -2202,28 +2121,21 @@
       "--test-list",
       "Flaky/Test/1\nFlaky/Test/2",
       "--copy-coredumps",
-      "--shards=1",
-      "--shard=1",
-      "--output_directory=${ISOLATED_OUTDIR}"
+      "--output_directory",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder/sdk",
-    "infra_step": true,
-    "name": "deflaking.trigger shards for test1.[trigger] test1_shard_1",
+    "name": "deflaking.test1",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@Run on OS: 'Linux'@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"test1_shard_1/Linux/test_hash/analyzer-none-linux-release-be/1357\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"test1_shard_1/Linux/test_hash/analyzer-none-linux-release-be/1357\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"130000\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"view_url\": \"https://chromium-swarm.appspot.com/user/task/130000\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    }@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@STEP_LINK@shard #0@https://chromium-swarm.appspot.com/user/task/130000@@@"
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@results.json@{\"name\":\"Flaky/Test/1\"}@@@",
+      "@@@STEP_LOG_LINE@results.json@{\"name\":\"Flaky/Test/2\"}@@@",
+      "@@@STEP_LOG_END@results.json@@@",
+      "@@@STEP_LOG_LINE@run.json@{\"build\":123}@@@",
+      "@@@STEP_LOG_END@run.json@@@",
+      "@@@STEP_LOG_LINE@logs.json@{\"Flaky/Test/1\":\"log\"}@@@",
+      "@@@STEP_LOG_LINE@logs.json@{\"Flaky/Test/2\":\"log\"}@@@",
+      "@@@STEP_LOG_END@logs.json@@@"
     ]
   },
   {
@@ -2354,94 +2266,6 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
-      "--show-path",
-      "--with-third-party-lib",
-      "--",
-      "python",
-      "RECIPE_MODULE[build::swarming]/resources/collect_task.py",
-      "--verbose",
-      "-o",
-      "/path/to/tmp/json",
-      "--task-output-dir",
-      "/path/to/tmp/",
-      "--merge-script",
-      "RECIPE_MODULE[build::swarming]/resources/noop_merge.py",
-      "--merge-script-stdout-file",
-      "/path/to/tmp/merge_script_log",
-      "--merge-additional-args",
-      "[]",
-      "--summary-json-file",
-      "/path/to/tmp/json",
-      "--",
-      "swarming",
-      "collect",
-      "-server",
-      "https://chromium-swarm.appspot.com",
-      "-worker",
-      "50",
-      "-task-summary-python",
-      "-task-output-stdout",
-      "all",
-      "-verbose",
-      "-requests-json",
-      "{\"tasks\": [{\"task_id\": \"130000\"}]}"
-    ],
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/swarming_client"
-      ]
-    },
-    "name": "deflaking.test1_shard_1",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_TEXT@Run on OS: 'Linux'<br>Pending time: 0:01:11<br>Shard duration: 0:01:00@@@",
-      "@@@STEP_LOG_LINE@json.output@{}@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@STEP_LOG_LINE@swarming.summary@{@@@",
-      "@@@STEP_LOG_LINE@swarming.summary@  \"shards\": [@@@",
-      "@@@STEP_LOG_LINE@swarming.summary@    {@@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      \"abandoned_ts\": null, @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      \"bot_id\": \"vm30\", @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      \"completed_ts\": \"2014-09-25T01:43:11.123\", @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      \"created_ts\": \"2014-09-25T01:41:00.123\", @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      \"duration\": 31.5, @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      \"exit_code\": \"0\", @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      \"failure\": false, @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      \"internal_failure\": false, @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      \"modified_ts\": \"2014-09-25 01:42:00\", @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      \"name\": \"heartbeat-canary-2014-09-25_01:41:55-os=Windows\", @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      \"output\": \"Heart beat succeeded on win32.\\nFoo\", @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      \"outputs_ref\": {@@@",
-      "@@@STEP_LOG_LINE@swarming.summary@        \"isolated\": \"abc123\", @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@        \"isolatedserver\": \"https://isolateserver.appspot.com\", @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@        \"namespace\": \"default-gzip\"@@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      }, @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      \"started_ts\": \"2014-09-25T01:42:11.123\", @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      \"state\": \"COMPLETED\", @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      \"task_id\": \"148aa78d7aa0000\"@@@",
-      "@@@STEP_LOG_LINE@swarming.summary@    }@@@",
-      "@@@STEP_LOG_LINE@swarming.summary@  ]@@@",
-      "@@@STEP_LOG_LINE@swarming.summary@}@@@",
-      "@@@STEP_LOG_END@swarming.summary@@@",
-      "@@@STEP_LOG_LINE@Merge script log@Successfully merged all data@@@",
-      "@@@STEP_LOG_END@Merge script log@@@",
-      "@@@STEP_LOG_LINE@results.json@{\"name\":\"Flaky/Test/1\"}@@@",
-      "@@@STEP_LOG_LINE@results.json@{\"name\":\"Flaky/Test/2\"}@@@",
-      "@@@STEP_LOG_END@results.json@@@",
-      "@@@STEP_LOG_LINE@run.json@{\"build\":123}@@@",
-      "@@@STEP_LOG_END@run.json@@@",
-      "@@@STEP_LOG_LINE@logs.json@{\"Flaky/Test/1\":\"log\"}@@@",
-      "@@@STEP_LOG_LINE@logs.json@{\"Flaky/Test/2\":\"log\"}@@@",
-      "@@@STEP_LOG_END@logs.json@@@",
-      "@@@STEP_LINK@shard #0 isolated out@https://isolateserver.appspot.com/browse?namespace=default-gzip&hash=abc123@@@",
-      "@@@STEP_LINK@test stdout of shard #0@https://chromium-swarm.appspot.com/user/task/130000@@@"
-    ]
-  },
-  {
-    "cmd": [
       "[CACHE]/builder/sdk/tools/sdks/dart-sdk/bin/dart",
       "tools/bots/update_flakiness.dart",
       "-i",
@@ -2452,7 +2276,7 @@
       "8945511751514863184",
       "--commit",
       "3456abce78ef",
-      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n"
+      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n"
     ],
     "cwd": "[CACHE]/builder/sdk",
     "name": "update flakiness information",
@@ -2469,7 +2293,7 @@
       "--human",
       "--verbose",
       "[CACHE]/builder/sdk/LATEST/results.json",
-      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n",
+      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n",
       "[CACHE]/builder/sdk/LATEST/approved_results.json",
       "--changed",
       "--failing",
@@ -2492,7 +2316,7 @@
       "--human",
       "--verbose",
       "[CACHE]/builder/sdk/LATEST/results.json",
-      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n",
+      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n",
       "[CACHE]/builder/sdk/LATEST/approved_results.json",
       "--logs",
       "{\"test\":\"log\"}\n{\"Flaky/Test/1\":\"log\"}\n{\"Flaky/Test/2\":\"log\"}{\"test\":\"log\"}\n{\"Flaky/Test/1\":\"log\"}\n{\"Flaky/Test/2\":\"log\"}{\"test\":\"log\"}\n{\"Flaky/Test/1\":\"log\"}\n{\"Flaky/Test/2\":\"log\"}",
@@ -2516,7 +2340,7 @@
       "--human",
       "--verbose",
       "[CACHE]/builder/sdk/LATEST/results.json",
-      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n",
+      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n",
       "[CACHE]/builder/sdk/LATEST/approved_results.json",
       "--changed",
       "--passing",
@@ -2539,7 +2363,7 @@
       "--human",
       "--verbose",
       "[CACHE]/builder/sdk/LATEST/results.json",
-      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n",
+      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n",
       "[CACHE]/builder/sdk/LATEST/approved_results.json",
       "--unapproved",
       "--failing"
@@ -2560,7 +2384,7 @@
       "--human",
       "--verbose",
       "[CACHE]/builder/sdk/LATEST/results.json",
-      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n",
+      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n",
       "[CACHE]/builder/sdk/LATEST/approved_results.json",
       "--logs",
       "{\"test\":\"log\"}\n{\"Flaky/Test/1\":\"log\"}\n{\"Flaky/Test/2\":\"log\"}{\"test\":\"log\"}\n{\"Flaky/Test/1\":\"log\"}\n{\"Flaky/Test/2\":\"log\"}{\"test\":\"log\"}\n{\"Flaky/Test/1\":\"log\"}\n{\"Flaky/Test/2\":\"log\"}",
@@ -2584,7 +2408,7 @@
       "--human",
       "--verbose",
       "[CACHE]/builder/sdk/LATEST/results.json",
-      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n",
+      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n",
       "[CACHE]/builder/sdk/LATEST/approved_results.json",
       "--unapproved",
       "--passing"
@@ -2605,7 +2429,7 @@
       "--human",
       "--verbose",
       "[CACHE]/builder/sdk/LATEST/results.json",
-      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n",
+      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n",
       "[CACHE]/builder/sdk/LATEST/approved_results.json",
       "--logs",
       "{\"test\":\"log\"}\n{\"Flaky/Test/1\":\"log\"}\n{\"Flaky/Test/2\":\"log\"}{\"test\":\"log\"}\n{\"Flaky/Test/1\":\"log\"}\n{\"Flaky/Test/2\":\"log\"}{\"test\":\"log\"}\n{\"Flaky/Test/1\":\"log\"}\n{\"Flaky/Test/2\":\"log\"}",
@@ -2628,7 +2452,7 @@
       "--human",
       "--verbose",
       "[CACHE]/builder/sdk/LATEST/results.json",
-      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n",
+      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n",
       "[CACHE]/builder/sdk/LATEST/approved_results.json",
       "--judgement",
       "--failing",
@@ -2639,8 +2463,8 @@
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@results.json@{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}@@@",
       "@@@STEP_LOG_LINE@results.json@{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}@@@",
-      "@@@STEP_LOG_LINE@results.json@{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}@@@",
-      "@@@STEP_LOG_LINE@results.json@{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}@@@",
+      "@@@STEP_LOG_LINE@results.json@{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}@@@",
+      "@@@STEP_LOG_LINE@results.json@{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}@@@",
       "@@@STEP_LOG_LINE@results.json@{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}@@@",
       "@@@STEP_LOG_LINE@results.json@{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}@@@",
       "@@@STEP_LOG_LINE@results.json@{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}@@@",
@@ -2706,7 +2530,7 @@
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
       "cp",
-      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n",
+      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n",
       "gs://dart-test-results/builders/analyzer-none-linux-release-be/1357/results.json"
     ],
     "cwd": "[CACHE]/builder/sdk",
@@ -2786,7 +2610,7 @@
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
       "cp",
-      "{\"builder_name\": \"analyzer-none-linux-release-be\", \"bot_name\": \"vm30\", \"build\": 123, \"commit_time\": \"1234567\", \"commit_hash\": \"3456abce78ef\"}\n{\"builder_name\": \"analyzer-none-linux-release-be\", \"bot_name\": \"vm30\", \"build\": 123, \"commit_time\": \"1234567\", \"commit_hash\": \"3456abce78ef\"}\n{\"builder_name\": \"analyzer-none-linux-release-be\", \"bot_name\": \"trusty-dart-123\", \"build\": 123, \"commit_time\": \"1234567\", \"commit_hash\": \"3456abce78ef\"}\n{\"builder_name\": \"analyzer-none-linux-release-be\", \"bot_name\": \"trusty-dart-123\", \"build\": 123, \"commit_time\": \"1234567\", \"commit_hash\": \"3456abce78ef\"}\n{\"builder_name\": \"analyzer-none-linux-release-be\", \"bot_name\": \"vm30\", \"build\": 123, \"commit_time\": \"1234567\", \"commit_hash\": \"3456abce78ef\"}\n{\"builder_name\": \"analyzer-none-linux-release-be\", \"bot_name\": \"trusty-dart-123\", \"build\": 123, \"commit_time\": \"1234567\", \"commit_hash\": \"3456abce78ef\"}\n",
+      "{\"builder_name\": \"analyzer-none-linux-release-be\", \"bot_name\": \"vm30\", \"build\": 123, \"commit_time\": \"1234567\", \"commit_hash\": \"3456abce78ef\"}\n{\"builder_name\": \"analyzer-none-linux-release-be\", \"bot_name\": \"trusty-dart-123\", \"build\": 123, \"commit_time\": \"1234567\", \"commit_hash\": \"3456abce78ef\"}\n{\"builder_name\": \"analyzer-none-linux-release-be\", \"bot_name\": \"trusty-dart-123\", \"build\": 123, \"commit_time\": \"1234567\", \"commit_hash\": \"3456abce78ef\"}\n{\"builder_name\": \"analyzer-none-linux-release-be\", \"bot_name\": \"trusty-dart-123\", \"build\": 123, \"commit_time\": \"1234567\", \"commit_hash\": \"3456abce78ef\"}\n{\"builder_name\": \"analyzer-none-linux-release-be\", \"bot_name\": \"vm30\", \"build\": 123, \"commit_time\": \"1234567\", \"commit_hash\": \"3456abce78ef\"}\n{\"builder_name\": \"analyzer-none-linux-release-be\", \"bot_name\": \"trusty-dart-123\", \"build\": 123, \"commit_time\": \"1234567\", \"commit_hash\": \"3456abce78ef\"}\n",
       "gs://dart-test-results/builders/analyzer-none-linux-release-be/1357/runs.json"
     ],
     "cwd": "[CACHE]/builder/sdk",
@@ -2861,7 +2685,7 @@
     "cwd": "[CACHE]/builder/sdk",
     "infra_step": true,
     "name": "upload new results.upload test results to big query.upload results chunk to big query",
-    "stdin": "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n",
+    "stdin": "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"analyzer-none-linux-release-be\",\"bot_name\":\"trusty-dart-123\"}\n",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/scripts/slave/recipe_modules/dart/examples/example.expected/basic.json b/scripts/slave/recipe_modules/dart/examples/example.expected/basic.json
index 223bbbf..4564222 100644
--- a/scripts/slave/recipe_modules/dart/examples/example.expected/basic.json
+++ b/scripts/slave/recipe_modules/dart/examples/example.expected/basic.json
@@ -1542,96 +1542,13 @@
     ]
   },
   {
-    "cmd": [],
-    "cwd": "[CACHE]/builder/sdk",
-    "name": "deflaking.trigger shards for test1",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
     "cmd": [
-      "python",
-      "-u",
-      "[CACHE]/builder/sdk/tools/swarming_client/swarming.py",
-      "trigger",
-      "--swarming",
-      "https://chromium-swarm.appspot.com",
-      "--isolate-server",
-      "https://isolateserver.appspot.com",
-      "--priority",
-      "25",
-      "--shards",
-      "1",
-      "--task-name",
-      "test1_shard_1/Linux/test_hash/dart2js-linux-release-chrome-try/1357",
-      "--dump-json",
-      "/path/to/tmp/json",
-      "--expiration",
-      "3600",
-      "--io-timeout",
-      "1200",
-      "--hard-timeout",
-      "600",
-      "--dimension",
-      "cpu",
-      "x86-64",
-      "--dimension",
-      "os",
-      "Linux",
-      "--dimension",
-      "pool",
-      "dart.tests",
-      "--named-cache",
-      "swarming_module_cache_vpython",
-      ".swarming_module_cache/vpython",
-      "--tag",
-      "build_is_experimental:false",
-      "--tag",
-      "buildername:dart2js-linux-release-chrome-try",
-      "--tag",
-      "buildnumber:1357",
-      "--tag",
-      "data:test_hash",
-      "--tag",
-      "gerrit:https://dart-review.googlesource.com/c/123456/7",
-      "--tag",
-      "name:test1_shard_1",
-      "--tag",
-      "spec_name:dart.try:dart2js-linux-release-chrome-try",
-      "--tag",
-      "stepname:test1_shard_1",
-      "--cipd-package",
-      "browsers:dart/browsers/chrome/${platform}:version:66.0.3359.139",
-      "--cipd-package",
-      "tools/sdks:dart/dart-sdk/${platform}:",
-      "--cipd-package",
-      ".swarming_module:infra/python/cpython/${platform}:TEST_VERSION",
-      "--cipd-package",
-      ".swarming_module:infra/tools/luci/logdog/butler/${platform}:TEST_VERSION",
-      "--cipd-package",
-      ".swarming_module:infra/tools/luci/vpython-native/${platform}:TEST_VERSION",
-      "--cipd-package",
-      ".swarming_module:infra/tools/luci/vpython/${platform}:TEST_VERSION",
-      "--env-prefix",
-      "PATH",
-      ".swarming_module",
-      "--env-prefix",
-      "PATH",
-      ".swarming_module/bin",
-      "--env-prefix",
-      "VPYTHON_VIRTUALENV_ROOT",
-      ".swarming_module_cache/vpython",
-      "--isolated",
-      "test_hash",
-      "--raw-cmd",
-      "--",
       "/usr/bin/xvfb-run",
       "-a",
       "--server-args=-screen 0 1024x768x24",
       "python",
       "-u",
-      "tools/test.py",
+      "[CACHE]/builder/sdk/tools/test.py",
       "-ax64",
       "-mrelease",
       "--progress=status",
@@ -1650,28 +1567,21 @@
       "Flaky/Test/1\nFlaky/Test/2",
       "--copy-coredumps",
       "--chrome=browsers/chrome/google-chrome",
-      "--shards=1",
-      "--shard=1",
-      "--output_directory=${ISOLATED_OUTDIR}"
+      "--output_directory",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder/sdk",
-    "infra_step": true,
-    "name": "deflaking.trigger shards for test1.[trigger] test1_shard_1",
+    "name": "deflaking.test1",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@Run on OS: 'Linux'@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"test1_shard_1/Linux/test_hash/dart2js-linux-release-chrome-try/1357\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"test1_shard_1/Linux/test_hash/dart2js-linux-release-chrome-try/1357\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"120000\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"view_url\": \"https://chromium-swarm.appspot.com/user/task/120000\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    }@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@STEP_LINK@shard #0@https://chromium-swarm.appspot.com/user/task/120000@@@"
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@results.json@{\"name\":\"Flaky/Test/1\"}@@@",
+      "@@@STEP_LOG_LINE@results.json@{\"name\":\"Flaky/Test/2\"}@@@",
+      "@@@STEP_LOG_END@results.json@@@",
+      "@@@STEP_LOG_LINE@run.json@{\"build\":123}@@@",
+      "@@@STEP_LOG_END@run.json@@@",
+      "@@@STEP_LOG_LINE@logs.json@{\"Flaky/Test/1\":\"log\"}@@@",
+      "@@@STEP_LOG_LINE@logs.json@{\"Flaky/Test/2\":\"log\"}@@@",
+      "@@@STEP_LOG_END@logs.json@@@"
     ]
   },
   {
@@ -1743,94 +1653,6 @@
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
-      "--show-path",
-      "--with-third-party-lib",
-      "--",
-      "python",
-      "RECIPE_MODULE[build::swarming]/resources/collect_task.py",
-      "--verbose",
-      "-o",
-      "/path/to/tmp/json",
-      "--task-output-dir",
-      "/path/to/tmp/",
-      "--merge-script",
-      "RECIPE_MODULE[build::swarming]/resources/noop_merge.py",
-      "--merge-script-stdout-file",
-      "/path/to/tmp/merge_script_log",
-      "--merge-additional-args",
-      "[]",
-      "--summary-json-file",
-      "/path/to/tmp/json",
-      "--",
-      "swarming",
-      "collect",
-      "-server",
-      "https://chromium-swarm.appspot.com",
-      "-worker",
-      "50",
-      "-task-summary-python",
-      "-task-output-stdout",
-      "all",
-      "-verbose",
-      "-requests-json",
-      "{\"tasks\": [{\"task_id\": \"120000\"}]}"
-    ],
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/swarming_client"
-      ]
-    },
-    "name": "deflaking.test1_shard_1",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_TEXT@Run on OS: 'Linux'<br>Pending time: 0:01:11<br>Shard duration: 0:01:00@@@",
-      "@@@STEP_LOG_LINE@json.output@{}@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@STEP_LOG_LINE@swarming.summary@{@@@",
-      "@@@STEP_LOG_LINE@swarming.summary@  \"shards\": [@@@",
-      "@@@STEP_LOG_LINE@swarming.summary@    {@@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      \"abandoned_ts\": null, @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      \"bot_id\": \"vm30\", @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      \"completed_ts\": \"2014-09-25T01:43:11.123\", @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      \"created_ts\": \"2014-09-25T01:41:00.123\", @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      \"duration\": 31.5, @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      \"exit_code\": \"0\", @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      \"failure\": false, @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      \"internal_failure\": false, @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      \"modified_ts\": \"2014-09-25 01:42:00\", @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      \"name\": \"heartbeat-canary-2014-09-25_01:41:55-os=Windows\", @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      \"output\": \"Heart beat succeeded on win32.\\nFoo\", @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      \"outputs_ref\": {@@@",
-      "@@@STEP_LOG_LINE@swarming.summary@        \"isolated\": \"abc123\", @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@        \"isolatedserver\": \"https://isolateserver.appspot.com\", @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@        \"namespace\": \"default-gzip\"@@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      }, @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      \"started_ts\": \"2014-09-25T01:42:11.123\", @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      \"state\": \"COMPLETED\", @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      \"task_id\": \"148aa78d7aa0000\"@@@",
-      "@@@STEP_LOG_LINE@swarming.summary@    }@@@",
-      "@@@STEP_LOG_LINE@swarming.summary@  ]@@@",
-      "@@@STEP_LOG_LINE@swarming.summary@}@@@",
-      "@@@STEP_LOG_END@swarming.summary@@@",
-      "@@@STEP_LOG_LINE@Merge script log@Successfully merged all data@@@",
-      "@@@STEP_LOG_END@Merge script log@@@",
-      "@@@STEP_LOG_LINE@results.json@{\"name\":\"Flaky/Test/1\"}@@@",
-      "@@@STEP_LOG_LINE@results.json@{\"name\":\"Flaky/Test/2\"}@@@",
-      "@@@STEP_LOG_END@results.json@@@",
-      "@@@STEP_LOG_LINE@run.json@{\"build\":123}@@@",
-      "@@@STEP_LOG_END@run.json@@@",
-      "@@@STEP_LOG_LINE@logs.json@{\"Flaky/Test/1\":\"log\"}@@@",
-      "@@@STEP_LOG_LINE@logs.json@{\"Flaky/Test/2\":\"log\"}@@@",
-      "@@@STEP_LOG_END@logs.json@@@",
-      "@@@STEP_LINK@shard #0 isolated out@https://isolateserver.appspot.com/browse?namespace=default-gzip&hash=abc123@@@",
-      "@@@STEP_LINK@test stdout of shard #0@https://chromium-swarm.appspot.com/user/task/120000@@@"
-    ]
-  },
-  {
-    "cmd": [
       "[CACHE]/builder/sdk/tools/sdks/dart-sdk/bin/dart",
       "tools/bots/update_flakiness.dart",
       "-i",
@@ -1841,7 +1663,7 @@
       "8945511751514863184",
       "--commit",
       "3456abce78ef",
-      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n"
+      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n"
     ],
     "cwd": "[CACHE]/builder/sdk",
     "name": "update flakiness information",
@@ -1858,7 +1680,7 @@
       "--human",
       "--verbose",
       "[CACHE]/builder/sdk/LATEST/results.json",
-      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n",
+      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n",
       "[CACHE]/builder/sdk/LATEST/approved_results.json",
       "--changed",
       "--failing",
@@ -1880,7 +1702,7 @@
       "--human",
       "--verbose",
       "[CACHE]/builder/sdk/LATEST/results.json",
-      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n",
+      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n",
       "[CACHE]/builder/sdk/LATEST/approved_results.json",
       "--logs",
       "{\"test\":\"log\"}\n{\"Flaky/Test/1\":\"log\"}\n{\"Flaky/Test/2\":\"log\"}{\"test\":\"log\"}\n{\"Flaky/Test/1\":\"log\"}\n{\"Flaky/Test/2\":\"log\"}",
@@ -1905,7 +1727,7 @@
       "--human",
       "--verbose",
       "[CACHE]/builder/sdk/LATEST/results.json",
-      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n",
+      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n",
       "[CACHE]/builder/sdk/LATEST/approved_results.json",
       "--changed",
       "--failing",
@@ -1927,7 +1749,7 @@
       "--human",
       "--verbose",
       "[CACHE]/builder/sdk/LATEST/results.json",
-      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n",
+      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n",
       "[CACHE]/builder/sdk/LATEST/approved_results.json",
       "--logs",
       "{\"test\":\"log\"}\n{\"Flaky/Test/1\":\"log\"}\n{\"Flaky/Test/2\":\"log\"}{\"test\":\"log\"}\n{\"Flaky/Test/1\":\"log\"}\n{\"Flaky/Test/2\":\"log\"}",
@@ -1952,7 +1774,7 @@
       "--human",
       "--verbose",
       "[CACHE]/builder/sdk/LATEST/results.json",
-      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n",
+      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n",
       "[CACHE]/builder/sdk/LATEST/approved_results.json",
       "--changed",
       "--passing",
@@ -1975,7 +1797,7 @@
       "--human",
       "--verbose",
       "[CACHE]/builder/sdk/LATEST/results.json",
-      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n",
+      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}\n",
       "[CACHE]/builder/sdk/LATEST/approved_results.json",
       "--judgement",
       "--changed",
@@ -1989,8 +1811,8 @@
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@results.json@{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}@@@",
       "@@@STEP_LOG_LINE@results.json@{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}@@@",
-      "@@@STEP_LOG_LINE@results.json@{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}@@@",
-      "@@@STEP_LOG_LINE@results.json@{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"vm30\"}@@@",
+      "@@@STEP_LOG_LINE@results.json@{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}@@@",
+      "@@@STEP_LOG_LINE@results.json@{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}@@@",
       "@@@STEP_LOG_LINE@results.json@{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}@@@",
       "@@@STEP_LOG_LINE@results.json@{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}@@@",
       "@@@STEP_LOG_LINE@results.json@{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"3456abce78ef\",\"build_number\":1357,\"builder_name\":\"dart2js-linux-release-chrome-try\",\"bot_name\":\"None\"}@@@",
diff --git a/scripts/slave/recipe_modules/dart/examples/example.expected/example-android.json b/scripts/slave/recipe_modules/dart/examples/example.expected/example-android.json
index 1f35a3a..008692f 100644
--- a/scripts/slave/recipe_modules/dart/examples/example.expected/example-android.json
+++ b/scripts/slave/recipe_modules/dart/examples/example.expected/example-android.json
@@ -1306,82 +1306,10 @@
     ]
   },
   {
-    "cmd": [],
-    "cwd": "[CACHE]/builder/sdk",
-    "name": "deflaking.trigger shards for android",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
     "cmd": [
       "python",
       "-u",
-      "[CACHE]/builder/sdk/tools/swarming_client/swarming.py",
-      "trigger",
-      "--swarming",
-      "https://chromium-swarm.appspot.com",
-      "--isolate-server",
-      "https://isolateserver.appspot.com",
-      "--priority",
-      "25",
-      "--shards",
-      "1",
-      "--task-name",
-      "android_shard_1/Android/test_hash/example-android/-1",
-      "--dump-json",
-      "/path/to/tmp/json",
-      "--expiration",
-      "3600",
-      "--io-timeout",
-      "1200",
-      "--hard-timeout",
-      "3600",
-      "--dimension",
-      "os",
-      "Android",
-      "--dimension",
-      "pool",
-      "dart.tests",
-      "--named-cache",
-      "swarming_module_cache_vpython",
-      ".swarming_module_cache/vpython",
-      "--tag",
-      "build_is_experimental:false",
-      "--tag",
-      "buildername:example-android",
-      "--tag",
-      "data:test_hash",
-      "--tag",
-      "name:android_shard_1",
-      "--tag",
-      "spec_name:dart.ci:example-android",
-      "--tag",
-      "stepname:android_shard_1 on Android",
-      "--cipd-package",
-      "tools/sdks:dart/dart-sdk/${platform}:",
-      "--cipd-package",
-      ".swarming_module:infra/python/cpython/${platform}:TEST_VERSION",
-      "--cipd-package",
-      ".swarming_module:infra/tools/luci/logdog/butler/${platform}:TEST_VERSION",
-      "--cipd-package",
-      ".swarming_module:infra/tools/luci/vpython-native/${platform}:TEST_VERSION",
-      "--cipd-package",
-      ".swarming_module:infra/tools/luci/vpython/${platform}:TEST_VERSION",
-      "--env-prefix",
-      "PATH",
-      ".swarming_module",
-      "--env-prefix",
-      "PATH",
-      ".swarming_module/bin",
-      "--env-prefix",
-      "VPYTHON_VIRTUALENV_ROOT",
-      ".swarming_module_cache/vpython",
-      "--isolated",
-      "test_hash",
-      "--raw-cmd",
-      "--",
-      "tools/test.py",
+      "[CACHE]/builder/sdk/tools/test.py",
       "-ax64",
       "-mrelease",
       "--progress=status",
@@ -1393,106 +1321,13 @@
       "--repeat=5",
       "--test-list",
       "Flaky/Test/1\nFlaky/Test/2",
-      "--shards=1",
-      "--shard=1",
-      "--output_directory=${ISOLATED_OUTDIR}"
+      "--output_directory",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder/sdk",
-    "infra_step": true,
-    "name": "deflaking.trigger shards for android.[trigger] android_shard_1 on Android",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_TEXT@Run on OS: 'Android'@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"android_shard_1/Android/test_hash/example-android/-1\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"android_shard_1/Android/test_hash/example-android/-1\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"120000\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"view_url\": \"https://chromium-swarm.appspot.com/user/task/120000\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    }@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@STEP_LINK@shard #0@https://chromium-swarm.appspot.com/user/task/120000@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
-      "--show-path",
-      "--with-third-party-lib",
-      "--",
-      "python",
-      "RECIPE_MODULE[build::swarming]/resources/collect_task.py",
-      "--verbose",
-      "-o",
-      "/path/to/tmp/json",
-      "--task-output-dir",
-      "/path/to/tmp/",
-      "--merge-script",
-      "RECIPE_MODULE[build::swarming]/resources/noop_merge.py",
-      "--merge-script-stdout-file",
-      "/path/to/tmp/merge_script_log",
-      "--merge-additional-args",
-      "[]",
-      "--summary-json-file",
-      "/path/to/tmp/json",
-      "--",
-      "swarming",
-      "collect",
-      "-server",
-      "https://chromium-swarm.appspot.com",
-      "-worker",
-      "50",
-      "-task-summary-python",
-      "-task-output-stdout",
-      "all",
-      "-verbose",
-      "-requests-json",
-      "{\"tasks\": [{\"task_id\": \"120000\"}]}"
-    ],
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/swarming_client"
-      ]
-    },
-    "name": "deflaking.android_shard_1 on Android",
+    "name": "deflaking.android",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_TEXT@Run on OS: 'Android'<br>Pending time: 0:01:11<br>Shard duration: 0:01:00@@@",
-      "@@@STEP_LOG_LINE@json.output@{}@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@STEP_LOG_LINE@swarming.summary@{@@@",
-      "@@@STEP_LOG_LINE@swarming.summary@  \"shards\": [@@@",
-      "@@@STEP_LOG_LINE@swarming.summary@    {@@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      \"abandoned_ts\": null, @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      \"bot_id\": \"vm30\", @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      \"completed_ts\": \"2014-09-25T01:43:11.123\", @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      \"created_ts\": \"2014-09-25T01:41:00.123\", @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      \"duration\": 31.5, @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      \"exit_code\": \"0\", @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      \"failure\": false, @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      \"internal_failure\": false, @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      \"modified_ts\": \"2014-09-25 01:42:00\", @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      \"name\": \"heartbeat-canary-2014-09-25_01:41:55-os=Windows\", @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      \"output\": \"Heart beat succeeded on win32.\\nFoo\", @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      \"outputs_ref\": {@@@",
-      "@@@STEP_LOG_LINE@swarming.summary@        \"isolated\": \"abc123\", @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@        \"isolatedserver\": \"https://isolateserver.appspot.com\", @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@        \"namespace\": \"default-gzip\"@@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      }, @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      \"started_ts\": \"2014-09-25T01:42:11.123\", @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      \"state\": \"COMPLETED\", @@@",
-      "@@@STEP_LOG_LINE@swarming.summary@      \"task_id\": \"148aa78d7aa0000\"@@@",
-      "@@@STEP_LOG_LINE@swarming.summary@    }@@@",
-      "@@@STEP_LOG_LINE@swarming.summary@  ]@@@",
-      "@@@STEP_LOG_LINE@swarming.summary@}@@@",
-      "@@@STEP_LOG_END@swarming.summary@@@",
-      "@@@STEP_LOG_LINE@Merge script log@Successfully merged all data@@@",
-      "@@@STEP_LOG_END@Merge script log@@@",
       "@@@STEP_LOG_LINE@results.json@{\"name\":\"Flaky/Test/1\"}@@@",
       "@@@STEP_LOG_LINE@results.json@{\"name\":\"Flaky/Test/2\"}@@@",
       "@@@STEP_LOG_END@results.json@@@",
@@ -1500,9 +1335,7 @@
       "@@@STEP_LOG_END@run.json@@@",
       "@@@STEP_LOG_LINE@logs.json@{\"Flaky/Test/1\":\"log\"}@@@",
       "@@@STEP_LOG_LINE@logs.json@{\"Flaky/Test/2\":\"log\"}@@@",
-      "@@@STEP_LOG_END@logs.json@@@",
-      "@@@STEP_LINK@shard #0 isolated out@https://isolateserver.appspot.com/browse?namespace=default-gzip&hash=abc123@@@",
-      "@@@STEP_LINK@test stdout of shard #0@https://chromium-swarm.appspot.com/user/task/120000@@@"
+      "@@@STEP_LOG_END@logs.json@@@"
     ]
   },
   {
@@ -1517,7 +1350,7 @@
       "8945511751514863184",
       "--commit",
       "2d72510e447ab60a9728aeea2362d8be2cbd7789",
-      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n"
+      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"None\"}\n"
     ],
     "cwd": "[CACHE]/builder/sdk",
     "name": "update flakiness information",
@@ -1534,7 +1367,7 @@
       "--human",
       "--verbose",
       "[CACHE]/builder/sdk/LATEST/results.json",
-      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n",
+      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"None\"}\n",
       "[CACHE]/builder/sdk/LATEST/approved_results.json",
       "--changed",
       "--failing",
@@ -1557,7 +1390,7 @@
       "--human",
       "--verbose",
       "[CACHE]/builder/sdk/LATEST/results.json",
-      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n",
+      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"None\"}\n",
       "[CACHE]/builder/sdk/LATEST/approved_results.json",
       "--logs",
       "{\"test\":\"log\"}\n{\"Flaky/Test/1\":\"log\"}\n{\"Flaky/Test/2\":\"log\"}",
@@ -1581,7 +1414,7 @@
       "--human",
       "--verbose",
       "[CACHE]/builder/sdk/LATEST/results.json",
-      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n",
+      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"None\"}\n",
       "[CACHE]/builder/sdk/LATEST/approved_results.json",
       "--changed",
       "--passing",
@@ -1604,7 +1437,7 @@
       "--human",
       "--verbose",
       "[CACHE]/builder/sdk/LATEST/results.json",
-      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n",
+      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"None\"}\n",
       "[CACHE]/builder/sdk/LATEST/approved_results.json",
       "--unapproved",
       "--failing"
@@ -1625,7 +1458,7 @@
       "--human",
       "--verbose",
       "[CACHE]/builder/sdk/LATEST/results.json",
-      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n",
+      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"None\"}\n",
       "[CACHE]/builder/sdk/LATEST/approved_results.json",
       "--logs",
       "{\"test\":\"log\"}\n{\"Flaky/Test/1\":\"log\"}\n{\"Flaky/Test/2\":\"log\"}",
@@ -1649,7 +1482,7 @@
       "--human",
       "--verbose",
       "[CACHE]/builder/sdk/LATEST/results.json",
-      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n",
+      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"None\"}\n",
       "[CACHE]/builder/sdk/LATEST/approved_results.json",
       "--unapproved",
       "--passing"
@@ -1670,7 +1503,7 @@
       "--human",
       "--verbose",
       "[CACHE]/builder/sdk/LATEST/results.json",
-      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n",
+      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"None\"}\n",
       "[CACHE]/builder/sdk/LATEST/approved_results.json",
       "--logs",
       "{\"test\":\"log\"}\n{\"Flaky/Test/1\":\"log\"}\n{\"Flaky/Test/2\":\"log\"}",
@@ -1693,7 +1526,7 @@
       "--human",
       "--verbose",
       "[CACHE]/builder/sdk/LATEST/results.json",
-      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n",
+      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"None\"}\n",
       "[CACHE]/builder/sdk/LATEST/approved_results.json",
       "--failing",
       "--unapproved"
@@ -1703,8 +1536,8 @@
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@results.json@{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}@@@",
       "@@@STEP_LOG_LINE@results.json@{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}@@@",
-      "@@@STEP_LOG_LINE@results.json@{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}@@@",
-      "@@@STEP_LOG_LINE@results.json@{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}@@@",
+      "@@@STEP_LOG_LINE@results.json@{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"None\"}@@@",
+      "@@@STEP_LOG_LINE@results.json@{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"None\"}@@@",
       "@@@STEP_LOG_END@results.json@@@"
     ]
   },
@@ -1762,7 +1595,7 @@
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
       "cp",
-      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n",
+      "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"None\"}\n",
       "gs://dart-test-results/builders/example-android/0/results.json"
     ],
     "cwd": "[CACHE]/builder/sdk",
@@ -1842,7 +1675,7 @@
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
       "cp",
-      "{\"builder_name\": \"example-android\", \"bot_name\": \"vm30\", \"build\": 123, \"commit_time\": \"1234567\", \"commit_hash\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\"}\n{\"builder_name\": \"example-android\", \"bot_name\": \"vm30\", \"build\": 123, \"commit_time\": \"1234567\", \"commit_hash\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\"}\n",
+      "{\"builder_name\": \"example-android\", \"bot_name\": \"vm30\", \"build\": 123, \"commit_time\": \"1234567\", \"commit_hash\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\"}\n{\"builder_name\": \"example-android\", \"bot_name\": null, \"build\": 123, \"commit_time\": \"1234567\", \"commit_hash\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\"}\n",
       "gs://dart-test-results/builders/example-android/0/runs.json"
     ],
     "cwd": "[CACHE]/builder/sdk",
@@ -1917,7 +1750,7 @@
     "cwd": "[CACHE]/builder/sdk",
     "infra_step": true,
     "name": "upload new results.upload test results to big query.upload results chunk to big query",
-    "stdin": "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n",
+    "stdin": "{\"name\":\"test1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"test2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"vm30\"}\n{\"name\":\"Flaky/Test/1\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"None\"}\n{\"name\":\"Flaky/Test/2\",\"commit_time\":1234567,\"commit_hash\":\"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\"build_number\":0,\"builder_name\":\"example-android\",\"bot_name\":\"None\"}\n",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
diff --git a/scripts/slave/recipe_modules/dart/examples/example.py b/scripts/slave/recipe_modules/dart/examples/example.py
index ecde59a..1ff869b 100644
--- a/scripts/slave/recipe_modules/dart/examples/example.py
+++ b/scripts/slave/recipe_modules/dart/examples/example.py
@@ -193,6 +193,8 @@
     for i in range(1, shards):
       data += api.step_data('%s_shard_%s%s' % (name, i, suffix),
                             api.raw_io.output_dir(CANNED_OUTPUT_DIR))
+    # TODO(athom): Remove this hack when sharded deflaking works
+    local_shard = True
     deflaking_name = ('deflaking.%s' % name if local_shard
                       else 'deflaking.%s_shard_1%s' % (name, suffix))
     data += api.step_data(deflaking_name,