Revert of Relanding updates to swarming api to add chartjson output.

scripts/slave/recipes/chromium.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.
 
 DEPS = [
   'adb',
   'bisect_tester',
   'depot_tools/bot_update',
   'chromium',
   'chromium_android',
@@ skipping 473 matching lines @@
                             'shards': 2,
                         },
                     },
                 ],
             },
         })
     ) +
     api.override_step_data('telemetry_gpu_unittests on Ubuntu-12.04',
         api.test_utils.canned_isolated_script_output(
             passing=True, is_win=False, swarming=True,
-            shards=2, isolated_script_passing=True, valid=True,
-            output_chartjson=True),
+            shards=2, isolated_script_passing=True, valid=True),
         retcode=0)
   )
 
   yield (
     api.test('dynamic_swarmed_sharded_failed_isolated_script_test') +
     api.properties.generic(mastername='chromium.linux',
                            buildername='Linux Tests',
                            parent_buildername='Linux Builder') +
     api.properties(swarm_hashes={
       'telemetry_gpu_unittests': 'eeeeeeeeeeeeeeeeeeeeeeeeeeeeee',
@@ skipping 86 matching lines @@
     ) +
     api.override_step_data(
       'telemetry_gpu_unittests on Ubuntu-12.04',
       api.test_utils.canned_isolated_script_output(
         passing=True, is_win=False, swarming=True,
         shards=2, isolated_script_passing=True, valid=True,
         empty_shards=[1]),
       retcode=1)
   )
 
-  yield (
-    api.test(
-      'dynamic_swarmed_sharded_isolated_chartjson_test_harness_failure') +
-    api.properties.generic(mastername='chromium.linux',
-                           buildername='Linux Tests',
-                           parent_buildername='Linux Builder') +
-    api.properties(swarm_hashes={
-      'telemetry_gpu_unittests': 'eeeeeeeeeeeeeeeeeeeeeeeeeeeeee',
-    }) +
-    api.platform('linux', 64) +
-    api.override_step_data(
-        'read test spec (chromium.linux.json)',
-        api.json.output({
-            'Linux Tests': {
-                'isolated_scripts': [
-                    {
-                        'isolate_name': 'telemetry_gpu_unittests',
-                        'name': 'telemetry_gpu_unittests',
-                        'swarming': {
-                            'can_use_on_swarming_builders': True,
-                            'shards': 2,
-                        },
-                    },
-                ],
-            },
-        })
-    ) +
-    api.override_step_data(
-      'telemetry_gpu_unittests on Ubuntu-12.04',
-      api.test_utils.canned_isolated_script_output(
-        passing=True, is_win=False, swarming=True,
-        shards=4, isolated_script_passing=True, valid=True,
-        empty_shards=[1], output_chartjson=True),
-      retcode=1)
-  )
-
-  yield (
-    api.test('dynamic_swarmed_sharded_isolated_chartjson_test_missing_shard') +
-    api.properties.generic(mastername='chromium.linux',
-                           buildername='Linux Tests',
-                           parent_buildername='Linux Builder') +
-    api.properties(swarm_hashes={
-      'telemetry_gpu_unittests': 'eeeeeeeeeeeeeeeeeeeeeeeeeeeeee',
-    }) +
-    api.platform('linux', 64) +
-    api.override_step_data(
-        'read test spec (chromium.linux.json)',
-        api.json.output({
-            'Linux Tests': {
-                'isolated_scripts': [
-                    {
-                        'isolate_name': 'telemetry_gpu_unittests',
-                        'name': 'telemetry_gpu_unittests',
-                        'swarming': {
-                            'can_use_on_swarming_builders': True,
-                            'shards': 2,
-                        },
-                    },
-                ],
-            },
-        })
-    ) +
-    api.override_step_data(
-      'telemetry_gpu_unittests on Ubuntu-12.04',
-      api.test_utils.canned_isolated_script_output(
-        passing=True, is_win=False, swarming=True,
-        shards=2, isolated_script_passing=True, valid=True,
-        missing_shards=[1], output_chartjson=True),
-      retcode=1)
-  )
-
   yield (
     api.test('dynamic_swarmed_isolated_script_test_linux_gpu') +
     api.properties.generic(mastername='chromium.linux',
                            buildername='Linux Tests',
                            parent_buildername='Linux Builder') +
     api.properties(swarm_hashes={
       'telemetry_gpu_unittests': 'eeeeeeeeeeeeeeeeeeeeeeeeeeeeee',
     }) +
     api.platform('linux', 64) +
     api.override_step_data(
@@ skipping 754 matching lines @@
   yield (
     api.test('ensure_goma_fail') +
     api.properties(
         mastername='chromium.fyi',
         buildername='Linux remote_run Builder',
         slavename='build1-a1',
         buildnumber='77457',
         path_config='kitchen') +
     api.override_step_data('ensure_goma.ensure_installed', retcode=1)
   )