Relanding changes to swarming isolate script and refactor of slave_utils

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 json
 import re
 import string
 
 
 class Test(object):
   """
   Base class for tests that can be retried after deapplying a previously
   applied patch.
   """
 
@@ skipping 1065 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
+
     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]
       ])
+    # Check for chartjson results and upload to results dashboard if present.
+    self._output_chartjson_results_if_present(api, step_result)
     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'

[tandrii(chromium), 2016/10/11 12:21:43]

This is now printed while simulation_test is run, polluting output. If you
actually want these printed, these should be output using annotations such as:
  step_result.presentation.step_text += "whatever you want to print"

+        return
+
+      if not results.get('enabled', True):
+        print 'Info: Benchmark disabled, not sending results to dashboard'
+        return
+
+      """Produces a step that uploads results to dashboard"""
+      args = [
+        '--results', json.dumps(results),
+        '--perf-id', api.properties['perf-id'],
+        '--results-url', api.properties['results-url'],
+        '--build-dir', api.chromium.c.build_dir,
+        '--got-revision-cp', api.properties['got_revision_cp'],
+        '--version', api.properties['version'],
+        '--git-revision', api.properties['git_revision'],
+        '--buildername', api.properties['buildername'],
+        '--buildnumber', api.properties['buildnumber'],
+        '--got-webrtc-revision', api.properties['got_webrtc_revision'],
+        '--got-v8-revision', api.properties['got_v8_revision'],
+      ]
+
+      api.python(
+        'Upload Perf Dashboard Results',
+        api.chromium.package_repo_resource(
+            'scripts', 'slave', 'upload_perf_dashboard_results.py'),
+        args)
+
+    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'),
 ]