[Findit] Hacky solution to map a CQ trybot step to a Waterfall buildbot step.

appengine/findit/waterfall/swarming_util.py

 # Copyright 2015 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 base64
 from collections import defaultdict
 import json
 import logging
 import urllib
 import zlib
@@ skipping 69 matching lines @@
 
   request.tags.extend(['findit:1', 'project:Chromium', 'purpose:post-commit'])
 
   url = 'https://%s/_ah/api/swarming/v1/tasks/new' % swarming_settings.get(
       'server_host')
   response_data = _SendRequestToServer(url, http_client, request.Serialize())
   return json.loads(response_data)['task_id']
 
 
 def ListSwarmingTasksDataByTags(
-    master_name, builder_name, build_number, http_client, step_name=None):
-  """Downloads tasks data from swarming server."""
+    master_name, builder_name, build_number, http_client,
+    additional_tag_filters=None):
+  """Downloads tasks data from swarming server.
+
+  Args:
+    additional_tag_filters(dict): More tag filters to be added.

[chanli, 2016/10/07 01:04:52]

Nit: add other args as well?

[stgao, 2016/10/07 01:19:33]

Done.

+  """
   base_url = ('https://%s/_ah/api/swarming/v1/tasks/'
               'list?tags=%s&tags=%s&tags=%s') % (
                   waterfall_config.GetSwarmingSettings().get('server_host'),
                   urllib.quote('master:%s' % master_name),
                   urllib.quote('buildername:%s' % builder_name),
                   urllib.quote('buildnumber:%d' % build_number))
-  if step_name:
-    base_url += '&tags=%s' % urllib.quote('stepname:%s' % step_name)
+  additional_tag_filters = additional_tag_filters or {}
+  for tag_name, tag_value in additional_tag_filters.iteritems():
+    base_url += '&tags=%s' % urllib.quote('%s:%s' % (tag_name, tag_value))
 
   items = []
   cursor = None
 
   while True:
     if not cursor:
       url = base_url
     else:
       url = base_url + '&cursor=%s' % urllib.quote(cursor)
     new_data = _SendRequestToServer(url, http_client)
@@ skipping 85 matching lines @@
   ndb.put_multi(new_steps)
   return True
 
 
 def GetIsolatedDataForStep(
     master_name, builder_name, build_number, step_name,
     http_client):
   """Returns the isolated data for a specific step."""
   step_isolated_data = []
   data = ListSwarmingTasksDataByTags(master_name, builder_name, build_number,
-                                     http_client, step_name)
+                                     http_client, {'stepname': step_name})
   if not data:
     return step_isolated_data
 
   for item in data:
     if item['failure'] and not item['internal_failure']:
       # Only retrieves test results from tasks which have failures and
       # the failure should not be internal infrastructure failure.
       isolated_data = _GenerateIsolatedData(item['outputs_ref'])
       step_isolated_data.append(isolated_data)
 
@@ skipping 147 matching lines @@
   shard_results = []
   for isolated_data in list_isolated_data:
     output_json = _DownloadTestResults(isolated_data, http_client)
     if not output_json:
       return None
     shard_results.append(output_json)
 
   if len(list_isolated_data) == 1:
     return shard_results[0]
   return _MergeSwarmingTestShards(shard_results)