Updating perf recipe for disabled chartjson data.

scripts/slave/results_dashboard.py

 #!/usr/bin/env python
 # Copyright (c) 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.
 
 """Functions for adding results to perf dashboard."""
 
 import calendar
 import datetime
 import httplib
@@ skipping 222 matching lines @@
         this includes revisions and annotation data.
     is_ref: True if this is a reference build, False otherwise.
 
   Returns:
     A dictionary in the format accepted by the perf dashboard.
   """
   if not chart_json:
     print 'Error: No json output from telemetry.'
     print '@@@STEP_FAILURE@@@'
 
+  # If benchmark was disabled it is a success, so just return the
+  # given chart_json since no results will be written to dashboard
+  if chart_json['disabled']:

[perezju, 2016/09/22 08:50:27]

change this to chart_json.get('disabled', False), in case we get an old
chartjson (e.g. on release bots we sometimes run new recipe code with old
chromium/catapult repositories).

[eyaich1, 2016/09/26 15:22:11]

Done.

+    return (True, chart_json)

[perezju, 2016/09/22 08:50:27]

I don't like this change. I think we still want the wrapping data with master,
versions, etc. (i.e. the "fields" dict below) to be shown on the waterfall, even
if the benchmark was disabled at the time.

I would suggest either:

1) copy the enabled/disabled value from the inner "chart_data" into the outer
"fields"; then test for results['enabled'] in _SendResultsToDashboard before
actually sending the data; or

2) don't change this function at all, and in _SendResultsToDashboard test for
results['chart_data'].get('enabled', False) before sending the data.

[eyaich1, 2016/09/26 15:22:11]

I went with #2.  My original thinking was that I reuse this method in my new
swarming recipe in https://codereview.chromium.org/2330133002/ so I was trying
to do the disabled check only once, but this makes more sense.  Hopefully the
code in runtests.py will be going away soon once the perf dashboard is swarmed
:)

Done. 

+
   # The master name used for the dashboard is the CamelCase name returned by
   # GetActiveMaster(), and not the canonical master name with dots.
   master = slave_utils.GetActiveMaster()
   point_id, versions = _RevisionNumberColumns(revision_dict, prefix='')
 
   supplemental = {}
   for key in supplemental_dict:
     if key.startswith('r_'):
       versions[key.replace('r_', '', 1)] = supplemental_dict[key]
     if key.startswith('a_'):
@@ skipping 11 matching lines @@
   fields = {
       'master': master,
       'bot': bot,
       'test_suite_name': test_name,
       'point_id': point_id,
       'supplemental': supplemental,
       'versions': versions,
       'chart_data': chart_json,
       'is_ref': is_ref,
   }
-  return fields
+  return (False, fields)
 
 
 def _GetStdioUriColumn(test_name, buildername, buildnumber):
   """Gets a supplemental column containing buildbot stdio link."""
   if not buildername or not buildnumber:
     return {}
 
   url = '%sbuilders/%s/builds/%s/steps/%s/logs/stdio' % (
       _GetBuildBotUrl(),
       urllib.quote(buildername),
@@ skipping 141 matching lines @@
     master, bot, test, revision = (
         data[0]['master'], data[0]['bot'], data[0]['test'], data[0]['revision'])
   else:
     master, bot, test, revision = (
         data['master'], data['bot'], data['chart_data']['benchmark_name'],
         data['point_id'])
   results_link = url + RESULTS_LINK_PATH % (
       urllib.quote(master), urllib.quote(bot), urllib.quote(test.split('/')[0]),
       revision)
   return '@@@STEP_LINK@%s@%s@@@' % ('Results Dashboard', results_link)