Revert "Switch remaining bots to new Telemetry GPU isolate."

scripts/slave/recipes/chromium_trybot.expected/telemetry_gpu_harness_failure.json

 [
   {
     "cmd": [
       "python",
       "-u",
       "[BUILD]/scripts/slave/bot_update.py",
       "--master",
       "tryserver.chromium.linux",
       "--builder",
       "linux_chromium_rel_ng",
@@ skipping 206 matching lines @@
       "python",
       "-u",
       "[SLAVE_BUILD]/src/tools/mb/mb.py",
       "analyze",
       "-m",
       "tryserver.chromium.linux",
       "-b",
       "linux_chromium_rel_ng",
       "-v",
       "//out/Release",
-      "{\"additional_compile_targets\": [\"chromium_swarm_tests\"], \"files\": [\"foo.cc\"], \"test_targets\": [\"angle_unittests_run\", \"content_gl_tests_run\", \"gl_tests_run\", \"gl_unittests_run\", \"tab_capture_end2end_tests_run\", \"telemetry_gpu_new_test_run\"]}",
+      "{\"additional_compile_targets\": [\"chromium_swarm_tests\"], \"files\": [\"foo.cc\"], \"test_targets\": [\"angle_unittests_run\", \"chrome\", \"content_gl_tests_run\", \"gl_tests_run\", \"gl_unittests_run\", \"tab_capture_end2end_tests_run\", \"telemetry_gpu_test_run\"]}",
       "/path/to/tmp/json"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "analyze",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"compile_targets\": [@@@",
       "@@@STEP_LOG_LINE@json.output@    \"angle_unittests_run\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"chrome\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"chromium_builder_tests\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"content_gl_tests_run\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"gl_tests_run\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"tab_capture_end2end_tests_run\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"telemetry_gpu_new_test_run\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"telemetry_gpu_test_run\"@@@",
       "@@@STEP_LOG_LINE@json.output@  ], @@@",
       "@@@STEP_LOG_LINE@json.output@  \"status\": \"Found dependency\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"test_targets\": [@@@",
       "@@@STEP_LOG_LINE@json.output@    \"angle_unittests_run\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"chrome\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"chromium_builder_tests\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"content_gl_tests_run\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"gl_tests_run\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"tab_capture_end2end_tests_run\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"telemetry_gpu_new_test_run\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"telemetry_gpu_test_run\"@@@",
       "@@@STEP_LOG_LINE@json.output@  ]@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@",
       "@@@STEP_LOG_LINE@analyze_details@{@@@",
       "@@@STEP_LOG_LINE@analyze_details@  \"additional_compile_targets\": [@@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"chromium_swarm_tests\"@@@",
       "@@@STEP_LOG_LINE@analyze_details@  ], @@@",
       "@@@STEP_LOG_LINE@analyze_details@  \"compile_targets\": [@@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"angle_unittests_run\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"chrome\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"chromium_builder_tests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"content_gl_tests_run\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"gl_tests_run\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"tab_capture_end2end_tests_run\", @@@",
-      "@@@STEP_LOG_LINE@analyze_details@    \"telemetry_gpu_new_test_run\"@@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"telemetry_gpu_test_run\"@@@",
       "@@@STEP_LOG_LINE@analyze_details@  ], @@@",
       "@@@STEP_LOG_LINE@analyze_details@  \"self.m.filter.compile_targets\": [@@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"angle_unittests_run\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"chrome\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"chromium_builder_tests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"content_gl_tests_run\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"gl_tests_run\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"tab_capture_end2end_tests_run\", @@@",
-      "@@@STEP_LOG_LINE@analyze_details@    \"telemetry_gpu_new_test_run\"@@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"telemetry_gpu_test_run\"@@@",
       "@@@STEP_LOG_LINE@analyze_details@  ], @@@",
       "@@@STEP_LOG_LINE@analyze_details@  \"self.m.filter.test_targets\": [@@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"angle_unittests_run\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"chrome\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"chromium_builder_tests\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"content_gl_tests_run\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"gl_tests_run\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"tab_capture_end2end_tests_run\", @@@",
-      "@@@STEP_LOG_LINE@analyze_details@    \"telemetry_gpu_new_test_run\"@@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"telemetry_gpu_test_run\"@@@",
       "@@@STEP_LOG_LINE@analyze_details@  ], @@@",
       "@@@STEP_LOG_LINE@analyze_details@  \"test_targets\": [@@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"angle_unittests_run\", @@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"chrome\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"content_gl_tests_run\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"gl_tests_run\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"gl_unittests_run\", @@@",
       "@@@STEP_LOG_LINE@analyze_details@    \"tab_capture_end2end_tests_run\", @@@",
-      "@@@STEP_LOG_LINE@analyze_details@    \"telemetry_gpu_new_test_run\"@@@",
+      "@@@STEP_LOG_LINE@analyze_details@    \"telemetry_gpu_test_run\"@@@",
       "@@@STEP_LOG_LINE@analyze_details@  ]@@@",
       "@@@STEP_LOG_LINE@analyze_details@}@@@",
       "@@@STEP_LOG_END@analyze_details@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "[BUILD]/scripts/slave/cleanup_temp.py"
@@ skipping 21 matching lines @@
       "gen",
       "-m",
       "tryserver.chromium.linux",
       "-b",
       "linux_chromium_rel_ng",
       "--config-file",
       "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
       "--goma-dir",
       "[BUILD]/goma",
       "--swarming-targets-file",
-      "content_gl_tests\ngl_tests\nangle_unittests\ntelemetry_gpu_new_test\ntelemetry_gpu_new_test\ntelemetry_gpu_new_test\ntelemetry_gpu_new_test\ntelemetry_gpu_new_test\ntelemetry_gpu_new_test\ntelemetry_gpu_new_test\ntelemetry_gpu_new_test\ntelemetry_gpu_new_test\ntelemetry_gpu_new_test\ntab_capture_end2end_tests\n",
+      "content_gl_tests\ngl_tests\nangle_unittests\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntab_capture_end2end_tests\n",
       "//out/Release"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "generate_build_files (with patch)"
   },
   {
     "cmd": [
       "python",
       "-u",
       "[BUILD]/scripts/slave/compile.py",
@@ skipping 12 matching lines @@
       "--goma-fail-fast",
       "--goma-disable-local-fallback",
       "--ninja-ensure-up-to-date",
       "--",
       "angle_unittests_run",
       "chrome",
       "chromium_builder_tests",
       "content_gl_tests_run",
       "gl_tests_run",
       "tab_capture_end2end_tests_run",
-      "telemetry_gpu_new_test_run"
+      "telemetry_gpu_test_run"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "compile (with patch)",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
       "@@@STEP_LOG_END@json.output (invalid)@@@"
     ]
   },
   {
     "cmd": [
@@ skipping 17 matching lines @@
       "batcharchive",
       "--dump-json",
       "/path/to/tmp/json",
       "--isolate-server",
       "https://isolateserver.appspot.com",
       "--verbose",
       "[SLAVE_BUILD]/src/out/Release/tab_capture_end2end_tests.isolated.gen.json",
       "[SLAVE_BUILD]/src/out/Release/gl_tests.isolated.gen.json",
       "[SLAVE_BUILD]/src/out/Release/content_gl_tests.isolated.gen.json",
       "[SLAVE_BUILD]/src/out/Release/angle_unittests.isolated.gen.json",
-      "[SLAVE_BUILD]/src/out/Release/telemetry_gpu_new_test.isolated.gen.json"
+      "[SLAVE_BUILD]/src/out/Release/telemetry_gpu_test.isolated.gen.json"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "isolate tests",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"angle_unittests\": \"[dummy hash for angle_unittests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"content_gl_tests\": \"[dummy hash for content_gl_tests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"gl_tests\": \"[dummy hash for gl_tests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tab_capture_end2end_tests\": \"[dummy hash for tab_capture_end2end_tests]\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"telemetry_gpu_new_test\": \"[dummy hash for telemetry_gpu_new_test]\"@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"telemetry_gpu_test\": \"[dummy hash for telemetry_gpu_test]\"@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
       "trigger",
@@ skipping 286 matching lines @@
       "os",
       "Linux",
       "--dimension",
       "pool",
       "Chrome",
       "--tag",
       "buildername:linux_chromium_rel_ng",
       "--tag",
       "buildnumber:571",
       "--tag",
-      "data:[dummy hash for telemetry_gpu_new_test]",
+      "data:[dummy hash for telemetry_gpu_test]",
       "--tag",
       "gpu_test:1",
       "--tag",
       "master:tryserver.chromium.linux",
       "--tag",
       "name:maps_pixel_test on NVIDIA GPU on Linux (with patch)",
       "--tag",
       "os:Linux",
       "--tag",
       "patch_project:chromium",
       "--tag",
       "project:chromium",
       "--tag",
       "purpose:CQ",
       "--tag",
       "purpose:pre-commit",
       "--tag",
       "rietveld:https://codereview.chromium.org/12853011/#ps1",
       "--tag",
       "stepname:maps_pixel_test on NVIDIA GPU on Linux (with patch) on Linux",
       "--user",
       "commit-bot@chromium.org",
-      "[dummy hash for telemetry_gpu_new_test]",
+      "[dummy hash for telemetry_gpu_test]",
       "--",
       "maps",
       "--show-stdout",
       "--browser=release",
       "-v",
       "--build-revision",
       "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
       "--test-machine-name",
       "linux_chromium_rel_ng",
       "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
-      "--isolated-script-test-output=${ISOLATED_OUTDIR}/output.json"
+      "--output-format",
+      "json",
+      "--output-dir",
+      "${ISOLATED_OUTDIR}"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "[trigger] maps_pixel_test on NVIDIA GPU on Linux (with patch) on Linux",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"maps_pixel_test on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"maps_pixel_test on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
@@ skipping 39 matching lines @@
       "os",
       "Linux",
       "--dimension",
       "pool",
       "Chrome",
       "--tag",
       "buildername:linux_chromium_rel_ng",
       "--tag",
       "buildnumber:571",
       "--tag",
-      "data:[dummy hash for telemetry_gpu_new_test]",
+      "data:[dummy hash for telemetry_gpu_test]",
       "--tag",
       "gpu_test:1",
       "--tag",
       "master:tryserver.chromium.linux",
       "--tag",
       "name:pixel_test on NVIDIA GPU on Linux (with patch)",
       "--tag",
       "os:Linux",
       "--tag",
       "patch_project:chromium",
       "--tag",
       "project:chromium",
       "--tag",
       "purpose:CQ",
       "--tag",
       "purpose:pre-commit",
       "--tag",
       "rietveld:https://codereview.chromium.org/12853011/#ps1",
       "--tag",
       "stepname:pixel_test on NVIDIA GPU on Linux (with patch) on Linux",
       "--user",
       "commit-bot@chromium.org",
-      "[dummy hash for telemetry_gpu_new_test]",
+      "[dummy hash for telemetry_gpu_test]",
       "--",
       "pixel",
       "--show-stdout",
       "--browser=release",
       "-v",
       "--build-revision",
       "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
       "--download-refimg-from-cloud-storage",
       "--refimg-cloud-storage-bucket",
       "chromium-gpu-archive/reference-images",
       "--os-type",
       "linux",
       "--test-machine-name",
       "linux_chromium_rel_ng",
       "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
-      "--isolated-script-test-output=${ISOLATED_OUTDIR}/output.json"
+      "--output-format",
+      "json",
+      "--output-dir",
+      "${ISOLATED_OUTDIR}"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "[trigger] pixel_test on NVIDIA GPU on Linux (with patch) on Linux",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"pixel_test on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"pixel_test on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
@@ skipping 39 matching lines @@
       "os",
       "Linux",
       "--dimension",
       "pool",
       "Chrome",
       "--tag",
       "buildername:linux_chromium_rel_ng",
       "--tag",
       "buildnumber:571",
       "--tag",
-      "data:[dummy hash for telemetry_gpu_new_test]",
+      "data:[dummy hash for telemetry_gpu_test]",
       "--tag",
       "gpu_test:1",
       "--tag",
       "master:tryserver.chromium.linux",
       "--tag",
       "name:webgl_conformance on NVIDIA GPU on Linux (with patch)",
       "--tag",
       "os:Linux",
       "--tag",
       "patch_project:chromium",
       "--tag",
       "project:chromium",
       "--tag",
       "purpose:CQ",
       "--tag",
       "purpose:pre-commit",
       "--tag",
       "rietveld:https://codereview.chromium.org/12853011/#ps1",
       "--tag",
       "stepname:webgl_conformance on NVIDIA GPU on Linux (with patch) on Linux",
       "--user",
       "commit-bot@chromium.org",
-      "[dummy hash for telemetry_gpu_new_test]",
+      "[dummy hash for telemetry_gpu_test]",
       "--",
       "webgl_conformance",
       "--show-stdout",
       "--browser=release",
       "-v",
       "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
-      "--isolated-script-test-output=${ISOLATED_OUTDIR}/output.json"
+      "--output-format",
+      "json",
+      "--output-dir",
+      "${ISOLATED_OUTDIR}"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "[trigger] webgl_conformance on NVIDIA GPU on Linux (with patch) on Linux",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"webgl_conformance on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"webgl_conformance on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
@@ skipping 39 matching lines @@
       "os",
       "Linux",
       "--dimension",
       "pool",
       "Chrome",
       "--tag",
       "buildername:linux_chromium_rel_ng",
       "--tag",
       "buildnumber:571",
       "--tag",
-      "data:[dummy hash for telemetry_gpu_new_test]",
+      "data:[dummy hash for telemetry_gpu_test]",
       "--tag",
       "gpu_test:1",
       "--tag",
       "master:tryserver.chromium.linux",
       "--tag",
       "name:context_lost on NVIDIA GPU on Linux (with patch)",
       "--tag",
       "os:Linux",
       "--tag",
       "patch_project:chromium",
       "--tag",
       "project:chromium",
       "--tag",
       "purpose:CQ",
       "--tag",
       "purpose:pre-commit",
       "--tag",
       "rietveld:https://codereview.chromium.org/12853011/#ps1",
       "--tag",
       "stepname:context_lost on NVIDIA GPU on Linux (with patch) on Linux",
       "--user",
       "commit-bot@chromium.org",
-      "[dummy hash for telemetry_gpu_new_test]",
+      "[dummy hash for telemetry_gpu_test]",
       "--",
       "context_lost",
       "--show-stdout",
       "--browser=release",
       "-v",
       "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
-      "--isolated-script-test-output=${ISOLATED_OUTDIR}/output.json"
+      "--output-format",
+      "json",
+      "--output-dir",
+      "${ISOLATED_OUTDIR}"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "[trigger] context_lost on NVIDIA GPU on Linux (with patch) on Linux",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"context_lost on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"context_lost on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
@@ skipping 39 matching lines @@
       "os",
       "Linux",
       "--dimension",
       "pool",
       "Chrome",
       "--tag",
       "buildername:linux_chromium_rel_ng",
       "--tag",
       "buildnumber:571",
       "--tag",
-      "data:[dummy hash for telemetry_gpu_new_test]",
+      "data:[dummy hash for telemetry_gpu_test]",
       "--tag",
       "gpu_test:1",
       "--tag",
       "master:tryserver.chromium.linux",
       "--tag",
       "name:memory_test on NVIDIA GPU on Linux (with patch)",
       "--tag",
       "os:Linux",
       "--tag",
       "patch_project:chromium",
       "--tag",
       "project:chromium",
       "--tag",
       "purpose:CQ",
       "--tag",
       "purpose:pre-commit",
       "--tag",
       "rietveld:https://codereview.chromium.org/12853011/#ps1",
       "--tag",
       "stepname:memory_test on NVIDIA GPU on Linux (with patch) on Linux",
       "--user",
       "commit-bot@chromium.org",
-      "[dummy hash for telemetry_gpu_new_test]",
+      "[dummy hash for telemetry_gpu_test]",
       "--",
       "memory_test",
       "--show-stdout",
       "--browser=release",
       "-v",
       "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
-      "--isolated-script-test-output=${ISOLATED_OUTDIR}/output.json"
+      "--output-format",
+      "json",
+      "--output-dir",
+      "${ISOLATED_OUTDIR}"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "[trigger] memory_test on NVIDIA GPU on Linux (with patch) on Linux",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"memory_test on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"memory_test on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
@@ skipping 39 matching lines @@
       "os",
       "Linux",
       "--dimension",
       "pool",
       "Chrome",
       "--tag",
       "buildername:linux_chromium_rel_ng",
       "--tag",
       "buildnumber:571",
       "--tag",
-      "data:[dummy hash for telemetry_gpu_new_test]",
+      "data:[dummy hash for telemetry_gpu_test]",
       "--tag",
       "gpu_test:1",
       "--tag",
       "master:tryserver.chromium.linux",
       "--tag",
       "name:trace_test on NVIDIA GPU on Linux (with patch)",
       "--tag",
       "os:Linux",
       "--tag",
       "patch_project:chromium",
       "--tag",
       "project:chromium",
       "--tag",
       "purpose:CQ",
       "--tag",
       "purpose:pre-commit",
       "--tag",
       "rietveld:https://codereview.chromium.org/12853011/#ps1",
       "--tag",
       "stepname:trace_test on NVIDIA GPU on Linux (with patch) on Linux",
       "--user",
       "commit-bot@chromium.org",
-      "[dummy hash for telemetry_gpu_new_test]",
+      "[dummy hash for telemetry_gpu_test]",
       "--",
       "trace_test",
       "--show-stdout",
       "--browser=release",
       "-v",
       "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
-      "--isolated-script-test-output=${ISOLATED_OUTDIR}/output.json"
+      "--output-format",
+      "json",
+      "--output-dir",
+      "${ISOLATED_OUTDIR}"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "[trigger] trace_test on NVIDIA GPU on Linux (with patch) on Linux",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"trace_test on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"trace_test on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
@@ skipping 39 matching lines @@
       "os",
       "Linux",
       "--dimension",
       "pool",
       "Chrome",
       "--tag",
       "buildername:linux_chromium_rel_ng",
       "--tag",
       "buildnumber:571",
       "--tag",
-      "data:[dummy hash for telemetry_gpu_new_test]",
+      "data:[dummy hash for telemetry_gpu_test]",
       "--tag",
       "gpu_test:1",
       "--tag",
       "master:tryserver.chromium.linux",
       "--tag",
       "name:screenshot_sync on NVIDIA GPU on Linux (with patch)",
       "--tag",
       "os:Linux",
       "--tag",
       "patch_project:chromium",
       "--tag",
       "project:chromium",
       "--tag",
       "purpose:CQ",
       "--tag",
       "purpose:pre-commit",
       "--tag",
       "rietveld:https://codereview.chromium.org/12853011/#ps1",
       "--tag",
       "stepname:screenshot_sync on NVIDIA GPU on Linux (with patch) on Linux",
       "--user",
       "commit-bot@chromium.org",
-      "[dummy hash for telemetry_gpu_new_test]",
+      "[dummy hash for telemetry_gpu_test]",
       "--",
       "screenshot_sync",
       "--show-stdout",
       "--browser=release",
       "-v",
       "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
-      "--isolated-script-test-output=${ISOLATED_OUTDIR}/output.json"
+      "--output-format",
+      "json",
+      "--output-dir",
+      "${ISOLATED_OUTDIR}"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "[trigger] screenshot_sync on NVIDIA GPU on Linux (with patch) on Linux",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"screenshot_sync on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"screenshot_sync on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
@@ skipping 39 matching lines @@
       "os",
       "Linux",
       "--dimension",
       "pool",
       "Chrome",
       "--tag",
       "buildername:linux_chromium_rel_ng",
       "--tag",
       "buildnumber:571",
       "--tag",
-      "data:[dummy hash for telemetry_gpu_new_test]",
+      "data:[dummy hash for telemetry_gpu_test]",
       "--tag",
       "gpu_test:1",
       "--tag",
       "master:tryserver.chromium.linux",
       "--tag",
       "name:hardware_accelerated_feature on NVIDIA GPU on Linux (with patch)",
       "--tag",
       "os:Linux",
       "--tag",
       "patch_project:chromium",
       "--tag",
       "project:chromium",
       "--tag",
       "purpose:CQ",
       "--tag",
       "purpose:pre-commit",
       "--tag",
       "rietveld:https://codereview.chromium.org/12853011/#ps1",
       "--tag",
       "stepname:hardware_accelerated_feature on NVIDIA GPU on Linux (with patch) on Linux",
       "--user",
       "commit-bot@chromium.org",
-      "[dummy hash for telemetry_gpu_new_test]",
+      "[dummy hash for telemetry_gpu_test]",
       "--",
       "hardware_accelerated_feature",
       "--show-stdout",
       "--browser=release",
       "-v",
       "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
-      "--isolated-script-test-output=${ISOLATED_OUTDIR}/output.json"
+      "--output-format",
+      "json",
+      "--output-dir",
+      "${ISOLATED_OUTDIR}"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "[trigger] hardware_accelerated_feature on NVIDIA GPU on Linux (with patch) on Linux",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"hardware_accelerated_feature on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"hardware_accelerated_feature on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
@@ skipping 39 matching lines @@
       "os",
       "Linux",
       "--dimension",
       "pool",
       "Chrome",
       "--tag",
       "buildername:linux_chromium_rel_ng",
       "--tag",
       "buildnumber:571",
       "--tag",
-      "data:[dummy hash for telemetry_gpu_new_test]",
+      "data:[dummy hash for telemetry_gpu_test]",
       "--tag",
       "gpu_test:1",
       "--tag",
       "master:tryserver.chromium.linux",
       "--tag",
       "name:gpu_process_launch on NVIDIA GPU on Linux (with patch)",
       "--tag",
       "os:Linux",
       "--tag",
       "patch_project:chromium",
       "--tag",
       "project:chromium",
       "--tag",
       "purpose:CQ",
       "--tag",
       "purpose:pre-commit",
       "--tag",
       "rietveld:https://codereview.chromium.org/12853011/#ps1",
       "--tag",
       "stepname:gpu_process_launch on NVIDIA GPU on Linux (with patch) on Linux",
       "--user",
       "commit-bot@chromium.org",
-      "[dummy hash for telemetry_gpu_new_test]",
+      "[dummy hash for telemetry_gpu_test]",
       "--",
       "gpu_process",
       "--show-stdout",
       "--browser=release",
       "-v",
       "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
-      "--isolated-script-test-output=${ISOLATED_OUTDIR}/output.json"
+      "--output-format",
+      "json",
+      "--output-dir",
+      "${ISOLATED_OUTDIR}"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "[trigger] gpu_process_launch on NVIDIA GPU on Linux (with patch) on Linux",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"gpu_process_launch on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"gpu_process_launch on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
@@ skipping 39 matching lines @@
       "os",
       "Linux",
       "--dimension",
       "pool",
       "Chrome",
       "--tag",
       "buildername:linux_chromium_rel_ng",
       "--tag",
       "buildnumber:571",
       "--tag",
-      "data:[dummy hash for telemetry_gpu_new_test]",
+      "data:[dummy hash for telemetry_gpu_test]",
       "--tag",
       "gpu_test:1",
       "--tag",
       "master:tryserver.chromium.linux",
       "--tag",
       "name:gpu_rasterization on NVIDIA GPU on Linux (with patch)",
       "--tag",
       "os:Linux",
       "--tag",
       "patch_project:chromium",
       "--tag",
       "project:chromium",
       "--tag",
       "purpose:CQ",
       "--tag",
       "purpose:pre-commit",
       "--tag",
       "rietveld:https://codereview.chromium.org/12853011/#ps1",
       "--tag",
       "stepname:gpu_rasterization on NVIDIA GPU on Linux (with patch) on Linux",
       "--user",
       "commit-bot@chromium.org",
-      "[dummy hash for telemetry_gpu_new_test]",
+      "[dummy hash for telemetry_gpu_test]",
       "--",
       "gpu_rasterization",
       "--show-stdout",
       "--browser=release",
       "-v",
       "--build-revision",
       "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
       "--test-machine-name",
       "linux_chromium_rel_ng",
       "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
-      "--isolated-script-test-output=${ISOLATED_OUTDIR}/output.json"
+      "--output-format",
+      "json",
+      "--output-dir",
+      "${ISOLATED_OUTDIR}"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "[trigger] gpu_rasterization on NVIDIA GPU on Linux (with patch) on Linux",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"gpu_rasterization on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"gpu_rasterization on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
@@ skipping 248 matching lines @@
       "--shards",
       "1",
       "maps_pixel_test on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571",
       "--task-output-dir",
       "/path/to/tmp/"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "maps_pixel_test on NVIDIA GPU on Linux (with patch) on Linux",
     "~followup_annotations": [
       "step returned non-zero exit code: 255",
+      "@@@STEP_TEXT@<br/>failures:<br/>maps_pixel_test on NVIDIA GPU on Linux (entire test suite)<br/>@@@",
       "@@@STEP_LOG_LINE@outdir_json@{@@@",
-      "@@@STEP_LOG_LINE@outdir_json@  \"0/output.json\": \"{\\\"failures\\\": [], \\\"valid\\\": true}\", @@@",
+      "@@@STEP_LOG_LINE@outdir_json@  \"0/results.json\": \"{\\\"per_page_values\\\": [], \\\"pages\\\": {}}\", @@@",
       "@@@STEP_LOG_LINE@outdir_json@  \"summary.json\": \"{\\\"shards\\\": [{\\\"internal_failure\\\": false, \\\"failure\\\": true}]}\"@@@",
       "@@@STEP_LOG_LINE@outdir_json@}@@@",
       "@@@STEP_LOG_END@outdir_json@@@",
       "@@@STEP_FAILURE@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
       "collect",
       "--swarming",
       "https://chromium-swarm.appspot.com",
       "--decorate",
       "--print-status-updates",
       "--shards",
       "1",
       "pixel_test on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571",
       "--task-output-dir",
       "/path/to/tmp/"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "pixel_test on NVIDIA GPU on Linux (with patch) on Linux",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@outdir_json@{@@@",
-      "@@@STEP_LOG_LINE@outdir_json@  \"0/output.json\": \"{\\\"failures\\\": [], \\\"valid\\\": true}\", @@@",
+      "@@@STEP_LOG_LINE@outdir_json@  \"0/results.json\": \"{\\\"per_page_values\\\": [{\\\"page_id\\\": 0, \\\"type\\\": \\\"success\\\"}, {\\\"page_id\\\": 1, \\\"type\\\": \\\"success\\\"}], \\\"pages\\\": {\\\"1\\\": {\\\"name\\\": \\\"Test.Test2\\\"}, \\\"0\\\": {\\\"name\\\": \\\"Test.Test1\\\"}}}\", @@@",
       "@@@STEP_LOG_LINE@outdir_json@  \"summary.json\": \"{\\\"shards\\\": [{\\\"internal_failure\\\": false, \\\"failure\\\": false}]}\"@@@",
       "@@@STEP_LOG_LINE@outdir_json@}@@@",
       "@@@STEP_LOG_END@outdir_json@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
       "collect",
       "--swarming",
       "https://chromium-swarm.appspot.com",
       "--decorate",
       "--print-status-updates",
       "--shards",
       "1",
       "webgl_conformance on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571",
       "--task-output-dir",
       "/path/to/tmp/"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "webgl_conformance on NVIDIA GPU on Linux (with patch) on Linux",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@outdir_json@{@@@",
-      "@@@STEP_LOG_LINE@outdir_json@  \"0/output.json\": \"{\\\"failures\\\": [], \\\"valid\\\": true}\", @@@",
+      "@@@STEP_LOG_LINE@outdir_json@  \"0/results.json\": \"{\\\"per_page_values\\\": [{\\\"page_id\\\": 0, \\\"type\\\": \\\"success\\\"}, {\\\"page_id\\\": 1, \\\"type\\\": \\\"success\\\"}], \\\"pages\\\": {\\\"1\\\": {\\\"name\\\": \\\"Test.Test2\\\"}, \\\"0\\\": {\\\"name\\\": \\\"Test.Test1\\\"}}}\", @@@",
       "@@@STEP_LOG_LINE@outdir_json@  \"summary.json\": \"{\\\"shards\\\": [{\\\"internal_failure\\\": false, \\\"failure\\\": false}]}\"@@@",
       "@@@STEP_LOG_LINE@outdir_json@}@@@",
       "@@@STEP_LOG_END@outdir_json@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
       "collect",
       "--swarming",
       "https://chromium-swarm.appspot.com",
       "--decorate",
       "--print-status-updates",
       "--shards",
       "1",
       "context_lost on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571",
       "--task-output-dir",
       "/path/to/tmp/"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "context_lost on NVIDIA GPU on Linux (with patch) on Linux",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@outdir_json@{@@@",
-      "@@@STEP_LOG_LINE@outdir_json@  \"0/output.json\": \"{\\\"failures\\\": [], \\\"valid\\\": true}\", @@@",
+      "@@@STEP_LOG_LINE@outdir_json@  \"0/results.json\": \"{\\\"per_page_values\\\": [{\\\"page_id\\\": 0, \\\"type\\\": \\\"success\\\"}, {\\\"page_id\\\": 1, \\\"type\\\": \\\"success\\\"}], \\\"pages\\\": {\\\"1\\\": {\\\"name\\\": \\\"Test.Test2\\\"}, \\\"0\\\": {\\\"name\\\": \\\"Test.Test1\\\"}}}\", @@@",
       "@@@STEP_LOG_LINE@outdir_json@  \"summary.json\": \"{\\\"shards\\\": [{\\\"internal_failure\\\": false, \\\"failure\\\": false}]}\"@@@",
       "@@@STEP_LOG_LINE@outdir_json@}@@@",
       "@@@STEP_LOG_END@outdir_json@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
       "collect",
       "--swarming",
       "https://chromium-swarm.appspot.com",
       "--decorate",
       "--print-status-updates",
       "--shards",
       "1",
       "memory_test on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571",
       "--task-output-dir",
       "/path/to/tmp/"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "memory_test on NVIDIA GPU on Linux (with patch) on Linux",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@outdir_json@{@@@",
-      "@@@STEP_LOG_LINE@outdir_json@  \"0/output.json\": \"{\\\"failures\\\": [], \\\"valid\\\": true}\", @@@",
+      "@@@STEP_LOG_LINE@outdir_json@  \"0/results.json\": \"{\\\"per_page_values\\\": [{\\\"page_id\\\": 0, \\\"type\\\": \\\"success\\\"}, {\\\"page_id\\\": 1, \\\"type\\\": \\\"success\\\"}], \\\"pages\\\": {\\\"1\\\": {\\\"name\\\": \\\"Test.Test2\\\"}, \\\"0\\\": {\\\"name\\\": \\\"Test.Test1\\\"}}}\", @@@",
       "@@@STEP_LOG_LINE@outdir_json@  \"summary.json\": \"{\\\"shards\\\": [{\\\"internal_failure\\\": false, \\\"failure\\\": false}]}\"@@@",
       "@@@STEP_LOG_LINE@outdir_json@}@@@",
       "@@@STEP_LOG_END@outdir_json@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
       "collect",
       "--swarming",
       "https://chromium-swarm.appspot.com",
       "--decorate",
       "--print-status-updates",
       "--shards",
       "1",
       "trace_test on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571",
       "--task-output-dir",
       "/path/to/tmp/"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "trace_test on NVIDIA GPU on Linux (with patch) on Linux",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@outdir_json@{@@@",
-      "@@@STEP_LOG_LINE@outdir_json@  \"0/output.json\": \"{\\\"failures\\\": [], \\\"valid\\\": true}\", @@@",
+      "@@@STEP_LOG_LINE@outdir_json@  \"0/results.json\": \"{\\\"per_page_values\\\": [{\\\"page_id\\\": 0, \\\"type\\\": \\\"success\\\"}, {\\\"page_id\\\": 1, \\\"type\\\": \\\"success\\\"}], \\\"pages\\\": {\\\"1\\\": {\\\"name\\\": \\\"Test.Test2\\\"}, \\\"0\\\": {\\\"name\\\": \\\"Test.Test1\\\"}}}\", @@@",
       "@@@STEP_LOG_LINE@outdir_json@  \"summary.json\": \"{\\\"shards\\\": [{\\\"internal_failure\\\": false, \\\"failure\\\": false}]}\"@@@",
       "@@@STEP_LOG_LINE@outdir_json@}@@@",
       "@@@STEP_LOG_END@outdir_json@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
       "collect",
       "--swarming",
       "https://chromium-swarm.appspot.com",
       "--decorate",
       "--print-status-updates",
       "--shards",
       "1",
       "screenshot_sync on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571",
       "--task-output-dir",
       "/path/to/tmp/"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "screenshot_sync on NVIDIA GPU on Linux (with patch) on Linux",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@outdir_json@{@@@",
-      "@@@STEP_LOG_LINE@outdir_json@  \"0/output.json\": \"{\\\"failures\\\": [], \\\"valid\\\": true}\", @@@",
+      "@@@STEP_LOG_LINE@outdir_json@  \"0/results.json\": \"{\\\"per_page_values\\\": [{\\\"page_id\\\": 0, \\\"type\\\": \\\"success\\\"}, {\\\"page_id\\\": 1, \\\"type\\\": \\\"success\\\"}], \\\"pages\\\": {\\\"1\\\": {\\\"name\\\": \\\"Test.Test2\\\"}, \\\"0\\\": {\\\"name\\\": \\\"Test.Test1\\\"}}}\", @@@",
       "@@@STEP_LOG_LINE@outdir_json@  \"summary.json\": \"{\\\"shards\\\": [{\\\"internal_failure\\\": false, \\\"failure\\\": false}]}\"@@@",
       "@@@STEP_LOG_LINE@outdir_json@}@@@",
       "@@@STEP_LOG_END@outdir_json@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
       "collect",
       "--swarming",
       "https://chromium-swarm.appspot.com",
       "--decorate",
       "--print-status-updates",
       "--shards",
       "1",
       "hardware_accelerated_feature on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571",
       "--task-output-dir",
       "/path/to/tmp/"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "hardware_accelerated_feature on NVIDIA GPU on Linux (with patch) on Linux",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@outdir_json@{@@@",
-      "@@@STEP_LOG_LINE@outdir_json@  \"0/output.json\": \"{\\\"failures\\\": [], \\\"valid\\\": true}\", @@@",
+      "@@@STEP_LOG_LINE@outdir_json@  \"0/results.json\": \"{\\\"per_page_values\\\": [{\\\"page_id\\\": 0, \\\"type\\\": \\\"success\\\"}, {\\\"page_id\\\": 1, \\\"type\\\": \\\"success\\\"}], \\\"pages\\\": {\\\"1\\\": {\\\"name\\\": \\\"Test.Test2\\\"}, \\\"0\\\": {\\\"name\\\": \\\"Test.Test1\\\"}}}\", @@@",
       "@@@STEP_LOG_LINE@outdir_json@  \"summary.json\": \"{\\\"shards\\\": [{\\\"internal_failure\\\": false, \\\"failure\\\": false}]}\"@@@",
       "@@@STEP_LOG_LINE@outdir_json@}@@@",
       "@@@STEP_LOG_END@outdir_json@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
       "collect",
       "--swarming",
       "https://chromium-swarm.appspot.com",
       "--decorate",
       "--print-status-updates",
       "--shards",
       "1",
       "gpu_process_launch on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571",
       "--task-output-dir",
       "/path/to/tmp/"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "gpu_process_launch on NVIDIA GPU on Linux (with patch) on Linux",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@outdir_json@{@@@",
-      "@@@STEP_LOG_LINE@outdir_json@  \"0/output.json\": \"{\\\"failures\\\": [], \\\"valid\\\": true}\", @@@",
+      "@@@STEP_LOG_LINE@outdir_json@  \"0/results.json\": \"{\\\"per_page_values\\\": [{\\\"page_id\\\": 0, \\\"type\\\": \\\"success\\\"}, {\\\"page_id\\\": 1, \\\"type\\\": \\\"success\\\"}], \\\"pages\\\": {\\\"1\\\": {\\\"name\\\": \\\"Test.Test2\\\"}, \\\"0\\\": {\\\"name\\\": \\\"Test.Test1\\\"}}}\", @@@",
       "@@@STEP_LOG_LINE@outdir_json@  \"summary.json\": \"{\\\"shards\\\": [{\\\"internal_failure\\\": false, \\\"failure\\\": false}]}\"@@@",
       "@@@STEP_LOG_LINE@outdir_json@}@@@",
       "@@@STEP_LOG_END@outdir_json@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
       "collect",
       "--swarming",
       "https://chromium-swarm.appspot.com",
       "--decorate",
       "--print-status-updates",
       "--shards",
       "1",
       "gpu_rasterization on NVIDIA GPU on Linux (with patch)/Linux/[dummy has/linux_chromium_rel_ng/571",
       "--task-output-dir",
       "/path/to/tmp/"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "gpu_rasterization on NVIDIA GPU on Linux (with patch) on Linux",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@outdir_json@{@@@",
-      "@@@STEP_LOG_LINE@outdir_json@  \"0/output.json\": \"{\\\"failures\\\": [], \\\"valid\\\": true}\", @@@",
+      "@@@STEP_LOG_LINE@outdir_json@  \"0/results.json\": \"{\\\"per_page_values\\\": [{\\\"page_id\\\": 0, \\\"type\\\": \\\"success\\\"}, {\\\"page_id\\\": 1, \\\"type\\\": \\\"success\\\"}], \\\"pages\\\": {\\\"1\\\": {\\\"name\\\": \\\"Test.Test2\\\"}, \\\"0\\\": {\\\"name\\\": \\\"Test.Test1\\\"}}}\", @@@",
       "@@@STEP_LOG_LINE@outdir_json@  \"summary.json\": \"{\\\"shards\\\": [{\\\"internal_failure\\\": false, \\\"failure\\\": false}]}\"@@@",
       "@@@STEP_LOG_LINE@outdir_json@}@@@",
       "@@@STEP_LOG_END@outdir_json@@@"
     ]
   },
   {
     "allow_subannotations": true,
     "cmd": [
       "python",
       "-u",
@@ skipping 31 matching lines @@
       "--build-number",
       "571",
       "--test-type",
       "tab_capture_end2end_tests on NVIDIA GPU on Linux (with patch) on Linux",
       "--test-results-server",
       "test-results.appspot.com",
       "--chrome-revision",
       "170242"
     ],
     "cwd": "[SLAVE_BUILD]",
-    "name": "Upload to test-results [tab_capture_end2end_tests on NVIDIA GPU on Linux (with patch) on Linux]",
-    "~followup_annotations": [
-      "@@@SET_BUILD_PROPERTY@failure_type@\"INVALID_TEST_RESULTS\"@@@"
-    ]
-  },
-  {
+    "name": "Upload to test-results [tab_capture_end2end_tests on NVIDIA GPU on Linux (with patch) on Linux]"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[BUILD]/scripts/slave/bot_update.py",
+      "--master",
+      "tryserver.chromium.linux",
+      "--builder",
+      "linux_chromium_rel_ng",
+      "--slave",
+      "TestSlavename",
+      "--spec",
+      "cache_dir = None\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]",
+      "--root",
+      "src",
+      "--revision_mapping_file",
+      "{\"src\": \"got_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",
+      "--rietveld_server",
+      "https://codereview.chromium.org",
+      "--output_json",
+      "/path/to/tmp/json",
+      "--revision",
+      "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
+      "--force",
+      "--output_manifest"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "name": "bot_update (without patch)",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@Some step text@@@",
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"did_run\": true, @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"manifest\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }, @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src/native_client\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src/native_client.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }, @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src/third_party/angle\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src/third_party/angle.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }, @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src/third_party/webrtc\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src/third_party/webrtc.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"0f90628433546e61d9268596da93418c623137f4\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }, @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src/tools/swarming_client\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src/tools/swarming_client.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }, @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src/v8\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src/v8.git\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"revision\": \"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }@@@",
+      "@@@STEP_LOG_LINE@json.output@  }, @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"patch_failure\": false, @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"patch_root\": \"src\", @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"properties\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"got_revision_cp\": \"refs/heads/master@{#170242}\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\"@@@",
+      "@@@STEP_LOG_LINE@json.output@  }, @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"root\": \"src\", @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"step_text\": \"Some step text\"@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[DEPOT_TOOLS]/gclient.py",
+      "runhooks"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "env": {
+      "GYP_CHROMIUM_NO_ACTION": "1",
+      "GYP_DEFINES": "archive_gpu_tests=1 component=static_library dcheck_always_on=1 fastbuild=1 ffmpeg_branding=Chrome gomadir='[BUILD]/goma' proprietary_codecs=1 target_arch=x64 test_isolation_mode=prepare use_goma=1"
+    },
+    "name": "gclient runhooks (without patch)"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[isolate]/resources/find_isolated_tests.py",
+      "--build-dir",
+      "[SLAVE_BUILD]/src/out/Release",
+      "--clean-isolated-files"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "name": "clean isolated files (2)"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[SLAVE_BUILD]/src/tools/mb/mb.py",
+      "gen",
+      "-m",
+      "tryserver.chromium.linux",
+      "-b",
+      "linux_chromium_rel_ng",
+      "--config-file",
+      "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
+      "--goma-dir",
+      "[BUILD]/goma",
+      "--swarming-targets-file",
+      "telemetry_gpu_test\n",
+      "//out/Release"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "name": "generate_build_files (without patch)"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[BUILD]/scripts/slave/compile.py",
+      "--target",
+      "Release",
+      "--src-dir",
+      "[SLAVE_BUILD]/src",
+      "--build-tool",
+      "ninja",
+      "--compiler",
+      "goma",
+      "--goma-jsonstatus",
+      "/path/to/tmp/json",
+      "--goma-dir",
+      "[BUILD]/goma",
+      "--goma-fail-fast",
+      "--goma-disable-local-fallback",
+      "--ninja-ensure-up-to-date",
+      "--",
+      "chrome",
+      "telemetry_gpu_test_run"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "name": "compile (without patch)",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
+      "@@@STEP_LOG_END@json.output (invalid)@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "\nimport glob\nimport sys\nwith open(sys.argv[1], 'w') as f:\n  f.write('\\n'.join(glob.glob(sys.argv[2])))\n",
+      "/path/to/tmp/",
+      "[SLAVE_BUILD]/src/out/Release/*.isolated.gen.json"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "name": "find isolated targets"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[isolate]/resources/isolate.py",
+      "[SLAVE_BUILD]/src/tools/swarming_client",
+      "batcharchive",
+      "--dump-json",
+      "/path/to/tmp/json",
+      "--isolate-server",
+      "https://isolateserver.appspot.com",
+      "--verbose",
+      "[SLAVE_BUILD]/src/out/Release/dummy_target_1.isolated.gen.json",
+      "[SLAVE_BUILD]/src/out/Release/dummy_target_2.isolated.gen.json"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "name": "isolate tests (2)",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"dummy_target_1\": \"[dummy hash for dummy_target_1]\", @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"dummy_target_2\": \"[dummy hash for dummy_target_2]\"@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@",
+      "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"dummy_target_1\": \"[dummy hash for dummy_target_1]\", \"dummy_target_2\": \"[dummy hash for dummy_target_2]\"}@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+      "trigger",
+      "--swarming",
+      "https://chromium-swarm.appspot.com",
+      "--isolate-server",
+      "https://isolateserver.appspot.com",
+      "--priority",
+      "30",
+      "--shards",
+      "1",
+      "--task-name",
+      "maps_pixel_test on NVIDIA GPU on Linux (without patch)/Linux/[dummy has/linux_chromium_rel_ng/571",
+      "--dump-json",
+      "/path/to/tmp/json",
+      "--expiration",
+      "3600",
+      "--io-timeout",
+      "1200",
+      "--hard-timeout",
+      "3600",
+      "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
+      "gpu",
+      "10de:104a",
+      "--dimension",
+      "os",
+      "Linux",
+      "--dimension",
+      "pool",
+      "Chrome",
+      "--tag",
+      "buildername:linux_chromium_rel_ng",
+      "--tag",
+      "buildnumber:571",
+      "--tag",
+      "data:[dummy hash for telemetry_gpu_test]",
+      "--tag",
+      "gpu_test:1",
+      "--tag",
+      "master:tryserver.chromium.linux",
+      "--tag",
+      "name:maps_pixel_test on NVIDIA GPU on Linux (without patch)",
+      "--tag",
+      "os:Linux",
+      "--tag",
+      "patch_project:chromium",
+      "--tag",
+      "project:chromium",
+      "--tag",
+      "purpose:CQ",
+      "--tag",
+      "purpose:pre-commit",
+      "--tag",
+      "rietveld:https://codereview.chromium.org/12853011/#ps1",
+      "--tag",
+      "stepname:maps_pixel_test on NVIDIA GPU on Linux (without patch) on Linux",
+      "--user",
+      "commit-bot@chromium.org",
+      "[dummy hash for telemetry_gpu_test]",
+      "--",
+      "maps",
+      "--show-stdout",
+      "--browser=release",
+      "-v",
+      "--build-revision",
+      "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
+      "--test-machine-name",
+      "linux_chromium_rel_ng",
+      "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
+      "--story-filter=maps\\_pixel\\_test\\ on\\ NVIDIA\\ GPU\\ on\\ Linux\\ \\(entire\\ test\\ suite\\)",
+      "--output-format",
+      "json",
+      "--output-dir",
+      "${ISOLATED_OUTDIR}"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "name": "[trigger] maps_pixel_test on NVIDIA GPU on Linux (without patch) on Linux",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"maps_pixel_test on NVIDIA GPU on Linux (without patch)/Linux/[dummy has/linux_chromium_rel_ng/571\", @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"maps_pixel_test on NVIDIA GPU on Linux (without patch)/Linux/[dummy has/linux_chromium_rel_ng/571\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@",
+      "@@@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/10000@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+      "collect",
+      "--swarming",
+      "https://chromium-swarm.appspot.com",
+      "--decorate",
+      "--print-status-updates",
+      "--shards",
+      "1",
+      "maps_pixel_test on NVIDIA GPU on Linux (without patch)/Linux/[dummy has/linux_chromium_rel_ng/571",
+      "--task-output-dir",
+      "/path/to/tmp/"
+    ],
+    "cwd": "[SLAVE_BUILD]",
+    "name": "maps_pixel_test on NVIDIA GPU on Linux (without patch) on Linux",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@outdir_json@{@@@",
+      "@@@STEP_LOG_LINE@outdir_json@  \"0/results.json\": \"{\\\"per_page_values\\\": [{\\\"page_id\\\": 0, \\\"type\\\": \\\"success\\\"}, {\\\"page_id\\\": 1, \\\"type\\\": \\\"success\\\"}], \\\"pages\\\": {\\\"1\\\": {\\\"name\\\": \\\"Test.Test2\\\"}, \\\"0\\\": {\\\"name\\\": \\\"Test.Test1\\\"}}}\", @@@",
+      "@@@STEP_LOG_LINE@outdir_json@  \"summary.json\": \"{\\\"shards\\\": [{\\\"internal_failure\\\": false, \\\"failure\\\": false}]}\"@@@",
+      "@@@STEP_LOG_LINE@outdir_json@}@@@",
+      "@@@STEP_LOG_END@outdir_json@@@"
+    ]
+  },
+  {
     "cmd": [
       "python",
       "-u",
       "import sys; sys.exit(1)"
     ],
     "cwd": "[SLAVE_BUILD]",
-    "name": "maps_pixel_test on NVIDIA GPU on Linux",
+    "name": "maps_pixel_test on NVIDIA GPU on Linux (retry summary)",
     "~followup_annotations": [
       "step returned non-zero exit code: 1",
-      "@@@STEP_TEXT@TEST RESULTS WERE INVALID@@@",
+      "@@@STEP_TEXT@<br/>failures:<br/>maps_pixel_test on NVIDIA GPU on Linux (entire test suite)<br/>@@@",
       "@@@STEP_FAILURE@@@",
-      "@@@SET_BUILD_PROPERTY@failure_hash@\"0e008d12c556af3dc006fa5cce05891492096976\"@@@"
+      "@@@SET_BUILD_PROPERTY@failure_type@\"TEST_FAILURE\"@@@",
+      "@@@SET_BUILD_PROPERTY@failure_hash@\"ee4223db6cfe570efbddb3d86d1b3383610a11a2\"@@@"
     ]
   },
   {
     "name": "$result",
-    "reason": "1 out of 1 aggregated steps failed. Failures: Step('maps_pixel_test on NVIDIA GPU on Linux') failed with return_code 1",
+    "reason": "1 out of 1 aggregated steps failed. Failures: Step('maps_pixel_test on NVIDIA GPU on Linux (retry summary)') failed with return_code 1",
     "status_code": 1
   }
 ]