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

scripts/slave/recipes/chromium_trybot.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import collections
 
 from recipe_engine.types import freeze
 
 DEPS = [
   'amp',
@@ skipping 815 matching lines @@
         },
       })
     ) +
     api.override_step_data(
       'analyze',
       api.json.output({'invalid_targets': ['invalid target', 'another one']}))
   )
 
   gpu_targets = ['angle_unittests_run', 'chrome', 'chromium_builder_tests',
                  'content_gl_tests_run', 'gl_tests_run',
-                 'tab_capture_end2end_tests_run', 'telemetry_gpu_new_test_run']
+                 'tab_capture_end2end_tests_run', 'telemetry_gpu_test_run']
   yield (
     api.test('gpu_tests') +
     props(
       mastername='tryserver.chromium.mac',
       buildername='mac_chromium_rel_ng',
     ) +
     api.platform.name('mac') +
     api.override_step_data(
         'pixel_test on Intel GPU on Mac (with patch)',
-        api.test_utils.canned_isolated_script_output(
-            passing=False, is_win=False, swarming=True,
-            isolated_script_passing=False)) +
+        api.test_utils.canned_telemetry_gpu_output(
+            passing=False, is_win=False, swarming=True)) +
     api.override_step_data(
         'pixel_test on Intel GPU on Mac (without patch)',
-        api.test_utils.canned_isolated_script_output(
-            passing=False, is_win=False, swarming=True,
-            isolated_script_passing=False)) +
+        api.test_utils.canned_telemetry_gpu_output(
+            passing=False, is_win=False, swarming=True)) +
     api.override_step_data('analyze',
                            api.json.output({'status': 'Found dependency',
                                             'compile_targets': gpu_targets,
                                             'test_targets': gpu_targets}))
   )
 
   yield (
+    api.test('telemetry_gpu_no_summary') +
+    props(
+      mastername='tryserver.chromium.mac',
+      buildername='mac_chromium_rel_ng',
+    ) +
+    api.platform.name('mac') +
+    api.override_step_data('pixel_test on Intel GPU on Mac (with patch)',
+                           api.raw_io.output_dir({'0/results.json': ''})) +
+    api.override_step_data('analyze',
+                           api.json.output({'status': 'Found dependency',
+                                            'test_targets': gpu_targets,
+                                            'compile_targets': gpu_targets}))
+  )
+
+  yield (
     api.test('telemetry_gpu_harness_failure') +
     props(
       mastername='tryserver.chromium.linux',
       buildername='linux_chromium_rel_ng',
     ) +
     api.platform.name('linux') +
     api.override_step_data(
         'maps_pixel_test on NVIDIA GPU on Linux (with patch) on Linux',
-        api.test_utils.canned_isolated_script_output(
-            passing=False, is_win=False, swarming=True),
+        api.test_utils.canned_telemetry_gpu_output(
+            passing=False, is_win=False, swarming=True,
+            empty_per_page_values=True),
         retcode=255) +
     api.override_step_data('analyze',
                            api.json.output({'status': 'Found dependency',
                                             'test_targets': gpu_targets,
                                             'compile_targets': gpu_targets}))
   )
 
   yield (
     api.test('telemetry_gpu_swarming_error') +
     props(
       mastername='tryserver.chromium.mac',
       buildername='mac_chromium_rel_ng',
     ) +
     api.platform.name('mac') +
     api.override_step_data(
         'pixel_test on Intel GPU on Mac (with patch)',
-        api.test_utils.canned_isolated_script_output(
-            passing=False, is_win=False, swarming=True,
-            swarming_internal_failure=True)) +
+        api.raw_io.output_dir({
+          '0/results.json': '',
+          'summary.json': '{"shards": [{"internal_failure": true}]}'
+        })) +
     api.override_step_data('analyze',
                            api.json.output({'status': 'Found dependency',
                                             'test_targets': gpu_targets,
+                                            'compile_targets': gpu_targets}))
+  )
+
+  yield (
+    api.test('telemetry_gpu_no_results') +
+    props(
+      mastername='tryserver.chromium.mac',
+      buildername='mac_chromium_rel_ng',
+    ) +
+    api.platform.name('mac') +
+    api.override_step_data(
+        'pixel_test on Intel GPU on Mac (with patch)',
+        api.raw_io.output_dir({
+          '0/results.json': '',
+          'summary.json': '{"shards": [{"internal_failure": false}]}'
+        })) +
+    api.override_step_data('analyze',
+                           api.json.output({'status': 'Found dependency',
+                                            'test_targets': gpu_targets,
                                             'compile_targets': gpu_targets}))
   )
 
   yield (
     api.test('telemetry_gpu_with_results_but_bad_exit_code') +
     props(
       mastername='tryserver.chromium.mac',
       buildername='mac_chromium_rel_ng',
     ) +
     api.platform.name('mac') +
     # passing=True, but exit code != 0.
     api.override_step_data(
         'pixel_test on Intel GPU on Mac (with patch)',
-        api.test_utils.canned_isolated_script_output(
+        api.test_utils.canned_telemetry_gpu_output(
             passing=True, is_win=False, swarming=True),
         retcode=255
     ) +
     api.override_step_data('analyze',
                            api.json.output({'status': 'Found dependency',
                                             'test_targets': gpu_targets,
                                             'compile_targets': gpu_targets}))
   )
 
 
@@ skipping 170 matching lines @@
                            api.test_utils.canned_test_output(passing=True))
   )
 
   yield (
     api.test('use_v8_patch_on_blink_trybot') +
     props(mastername='tryserver.blink',
           buildername='mac_blink_rel',
           patch_project='v8') +
     api.platform.name('mac')
   )