Switch remaining bots to new Telemetry GPU isolate.

scripts/slave/recipes/chromium_trybot.py

Index: scripts/slave/recipes/chromium_trybot.py
diff --git a/scripts/slave/recipes/chromium_trybot.py b/scripts/slave/recipes/chromium_trybot.py
index 27d3b8a971609b8605ec16bd9a307ea6860b1d9c..ca8262ad1ff29bd85aa07fde75d7d1e3df2754f7 100644
--- a/scripts/slave/recipes/chromium_trybot.py
+++ b/scripts/slave/recipes/chromium_trybot.py
@@ -831,7 +831,7 @@ def GenTests(api):
 
   gpu_targets = ['angle_unittests_run', 'chrome', 'chromium_builder_tests',
                  'content_gl_tests_run', 'gl_tests_run',
-                 'tab_capture_end2end_tests_run', 'telemetry_gpu_test_run']
+                 'tab_capture_end2end_tests_run', 'telemetry_gpu_new_test_run']
   yield (
     api.test('gpu_tests') +
     props(
@@ -841,12 +841,14 @@ def GenTests(api):
     api.platform.name('mac') +
     api.override_step_data(
         'pixel_test on Intel GPU on Mac (with patch)',
-        api.test_utils.canned_telemetry_gpu_output(
-            passing=False, is_win=False, swarming=True)) +
+        api.test_utils.canned_isolated_script_output(
+            passing=False, is_win=False, swarming=True,
+            isolated_script_passing=False)) +

[Ken Russell (switch to Gerrit), 2015/12/08 06:41:50]

The "isolated_script_passing=False" change was significant here and below.
Without it, the results were considered invalid for the pixel_test step, and it
wasn't retried without the patch. I originally tried making the step results
valid in this case (in SwarmingIsolatedScriptTest in chromium_tests/steps.py)
but that seemed to have undesirable consequences, like too many configurations
retrying without the patch.

[Sergiy Byelozyorov, 2015/12/08 10:09:42]

Acknowledged.

     api.override_step_data(
         'pixel_test on Intel GPU on Mac (without patch)',
-        api.test_utils.canned_telemetry_gpu_output(
-            passing=False, is_win=False, swarming=True)) +
+        api.test_utils.canned_isolated_script_output(
+            passing=False, is_win=False, swarming=True,
+            isolated_script_passing=False)) +
     api.override_step_data('analyze',
                            api.json.output({'status': 'Found dependency',
                                             'compile_targets': gpu_targets,
@@ -854,21 +856,6 @@ def GenTests(api):
   )
 
   yield (
-    api.test('telemetry_gpu_no_summary') +

[Ken Russell (switch to Gerrit), 2015/12/08 06:41:50]

This test isn't needed any more since it tests deleted code paths.

-    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',
@@ -877,9 +864,8 @@ def GenTests(api):
     api.platform.name('linux') +
     api.override_step_data(
         'maps_pixel_test on NVIDIA GPU on Linux (with patch) on Linux',
-        api.test_utils.canned_telemetry_gpu_output(
-            passing=False, is_win=False, swarming=True,
-            empty_per_page_values=True),
+        api.test_utils.canned_isolated_script_output(
+            passing=False, is_win=False, swarming=True),
         retcode=255) +
     api.override_step_data('analyze',
                            api.json.output({'status': 'Found dependency',
@@ -896,29 +882,9 @@ def GenTests(api):
     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": 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') +

[Ken Russell (switch to Gerrit), 2015/12/08 06:41:50]

Same here.

-    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.test_utils.canned_isolated_script_output(
+            passing=False, is_win=False, swarming=True,
+            swarming_internal_failure=True),) +

[Sergiy Byelozyorov, 2015/12/08 10:09:42]

nit: remove , before )

[Ken Russell (switch to Gerrit), 2015/12/08 19:35:51]

Done.

     api.override_step_data('analyze',
                            api.json.output({'status': 'Found dependency',
                                             'test_targets': gpu_targets,
@@ -935,7 +901,7 @@ def GenTests(api):
     # passing=True, but exit code != 0.
     api.override_step_data(
         'pixel_test on Intel GPU on Mac (with patch)',
-        api.test_utils.canned_telemetry_gpu_output(
+        api.test_utils.canned_isolated_script_output(
             passing=True, is_win=False, swarming=True),
         retcode=255
     ) +