[Findit] Use heuristic analysis result for test try jobs(Findit side).

appengine/findit/waterfall/try_job_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 logging
 
 from google.appengine.ext import ndb
 
 from common import appengine_util
 from common import constants
@@ skipping 114 matching lines @@
     # For link failures, we pass the executable targets directly to try-job, and
     # there is no 'source' for link failures.
     # For compile failures, only pass the object files as the compile targets
     # for the bots that we use strict regex to extract such information.
     if not source_target.get('source') or strict_regex:
       compile_targets.append(source_target.get('target'))
 
   return compile_targets
 
 
-def _GetSuspectsForCompileFailureFromHeuristicResult(heuristic_result):
+def _GetSuspectsFromHeuristicResult(heuristic_result):
   suspected_revisions = []
   if not heuristic_result:
     return suspected_revisions
   for failure in heuristic_result.get('failures', []):
-    if failure['step_name'] == constants.COMPILE_STEP_NAME:
-      suspected_revisions = [c['revision'] for c in failure['suspected_cls']]
-  return suspected_revisions
+    suspected_revisions = [c['revision'] for c in failure['suspected_cls']]

[stgao, 2016/04/28 17:37:49]

I don't think this overwrite will be correct for tests.

For different step failures, there might be different culprit CLs, right?

[chanli, 2016/04/28 22:13:14]

Right... Good catch!

+  return list(set(suspected_revisions))
 
 
 def ScheduleTryJobIfNeeded(failure_info, signals, heuristic_result):
   master_name = failure_info['master_name']
   builder_name = failure_info['builder_name']
   build_number = failure_info['build_number']
   failed_steps = failure_info.get('failed_steps', [])
   builds = failure_info.get('builds', {})
 
   tryserver_mastername, tryserver_buildername = (
@@ skipping 11 matching lines @@
   failure_result_map = {}
   need_new_try_job, last_pass, try_job_type, targeted_tests = (
       _NeedANewTryJob(master_name, builder_name, build_number,
                       failed_steps, failure_result_map))
 
   if need_new_try_job:
     compile_targets = (_GetFailedTargetsFromSignals(
         signals, master_name, builder_name)
                        if try_job_type == TryJobType.COMPILE else None)
     suspected_revisions = (
-        _GetSuspectsForCompileFailureFromHeuristicResult(heuristic_result)
-        if try_job_type == TryJobType.COMPILE else None)
+        _GetSuspectsFromHeuristicResult(heuristic_result))

[lijeffrey, 2016/04/27 23:34:08]

nit: does this fit on one line?

[chanli, 2016/04/28 17:36:04]

Done.

 
     pipeline = (
         swarming_tasks_to_try_job_pipeline.SwarmingTasksToTryJobPipeline(
             master_name, builder_name, build_number,
             builds[str(last_pass)]['chromium_revision'],
             builds[str(build_number)]['chromium_revision'],
             builds[str(build_number)]['blame_list'],
             try_job_type, compile_targets, targeted_tests, suspected_revisions))
 
     pipeline.target = appengine_util.GetTargetNameForModule(
         constants.WATERFALL_BACKEND)
     pipeline.start(queue_name=constants.WATERFALL_TRY_JOB_QUEUE)
 
     if try_job_type == TryJobType.TEST:  # pragma: no cover
       logging_str = (
           'Trying to schedule swarming task(s) for build %s, %s, %s: %s'
           ' because of %s failure. A try job may be triggered if some reliable'
           ' failure is detected in task(s).') % (
               master_name, builder_name, build_number,
               pipeline.pipeline_status_path, try_job_type)
     else:  # pragma: no cover
       logging_str = (
           'Try job was scheduled for build %s, %s, %s: %s because of %s '
           'failure.') % (
               master_name, builder_name, build_number,
               pipeline.pipeline_status_path, try_job_type)
     logging.info(logging_str)
 
   return failure_result_map