Updating the SwarmingIsolatedScriptTest to upload chartjson results to the

scripts/slave/recipe_modules/chromium_tests/steps.py

 # Copyright 2014 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 datetime
 import re
 import string
 
+from slave import slave_utils
+from slave import results_dashboard
 
 class Test(object):
   """
   Base class for tests that can be retried after deapplying a previously
   applied patch.
   """
 
   def __init__(self):
     super(Test, self).__init__()
     self._test_runs = {}
@@ skipping 1062 matching lines @@
 
   def validate_task_results(self, api, step_result):
     results = getattr(step_result, 'isolated_script_results', None) or {}
 
     try:
       failures = results['failures']
       valid = results['valid']
       if not failures and step_result.retcode != 0:
         failures = ['%s (entire test suite)' % self.name]
         valid = False
+      # Check for chartjson results and upload to results dashboard if present.
+      self._output_chartjson_results_if_present(api, step_result)
     except (ValueError, KeyError) as e:
       step_result.presentation.logs['invalid_results_exc'] = [str(e)]
       valid = False
       failures = None
     if valid:
       step_result.presentation.step_text += api.test_utils.format_step_text([
         ['failures:', failures]
       ])
     return valid, failures
 
+  def _output_chartjson_results_if_present(self, api, step_result):
+    results =
+      getattr(step_result, 'isolated_script_chartjson_results', None) or {}
+    try:
+      if not 'charts' in results:
+        print 'Info: No chart json present'
+        return
+
+      if not results.get('enabled', True):
+        print 'Info: Benchmark disabled, not sending results to dashboard'
+        return
+
+      main_revision = \
+          GetMainRevision(api.properties, api.chromium.c.build_dir)
+      blink_revision = GetBlinkRevision(api.chromium.c.build_dir)

[Ken Russell (switch to Gerrit), 2016/09/28 20:34:26]

Blink's now folded into Chromium and doesn't have a separate revision. Is it
necessary to still maintain the concept of blink_revision? If so, can this just
use main_revision and can GetBlinkRevision be deleted?

[eyaich1, 2016/09/29 12:43:34]

That makes sense, but like I said in the notes I was basically just duplicating
what was in the existing recipe.  While I agree some cleanup needs to be done, I
would like to reduce the number of changes so I can compare the results of both
without too many additional changes.

+      revisions = slave_utils.GetTelemetryRevisions(

[Ken Russell (switch to Gerrit), 2016/09/28 20:34:26]

Does this function need to be specialized to Telemetry? Could it be called
something like GetPerfDashboardRevisions or similar?

[eyaich1, 2016/09/29 12:43:34]

Done.

+          api.properties, main_revision, blink_revision)
+      reference_build = 'reference' in self.name
+      stripped_test_name = self.name.replace('.reference', '')
+      dashboard_json = results_dashboard.MakeDashboardJsonV1(
+          results,
+          revisions, stripped_test_name, api.properties['perf-id'],
+          api.properties['buildername'], api.properties['buildnumber'],
+          None, reference_build)
+      if dashboard_json :
+        logging.debug(json.dumps(dashboard_json , indent=2))
+        results_dashboard.SendResults(
+          dashboard_json ,
+          api.properties['results-url'],
+          api.chromium.c.build_dir)
+      else:
+        print 'Error: No json output from telemetry.'

[Ken Russell (switch to Gerrit), 2016/09/28 20:34:26]

Perhaps 'Error: No perf dashboard JSON was produced'?

[eyaich1, 2016/09/29 12:43:34]

Done.

+        print '@@@STEP_FAILURE@@@'
+
+    except (ValueError, KeyError) as e:
+      print 'Error: Unable to upload chartjson results to perf dashboard'
+
 
 def generate_isolated_script(api, chromium_tests_api, mastername, buildername,
                              test_spec, bot_update_step, enable_swarming=False,
                              swarming_dimensions=None,
                              scripts_compile_targets=None):
   for spec in test_spec.get(buildername, {}).get('isolated_scripts', []):
     use_swarming = False
     swarming_shards = 1
     swarming_dimension_sets = None
     swarming_priority = None
@@ skipping 640 matching lines @@
           args=args)
       api.gsutil.upload(
           temp_output_dir.join(
               '%s-android-chrome.json' % timestamp_string),
           'chromium-annotated-tests', 'android')
 
 GOMA_TESTS = [
   GTestTest('base_unittests'),
   GTestTest('content_unittests'),
 ]