[Findit] Move configurable parameters in try_job_util.py to config

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.
 
 from datetime import timedelta
 import logging
 
 from google.appengine.ext import ndb
 
 from common import appengine_util
 from common import constants
 from common import time_util
 from common.waterfall import failure_type
 from model import analysis_status
 from model.wf_analysis import WfAnalysis
 from model.wf_build import WfBuild
 from model.wf_failure_group import WfFailureGroup
 from model.wf_try_job import WfTryJob
 from waterfall import waterfall_config
 
-# TODO(lijeffrey): Move this to config.
-MATCHING_GROUPS_SECONDS_AGO = 24 * 60 * 60  # 24 hours.
-
 
 def _ShouldBailOutForOutdatedBuild(build):
   return (time_util.GetUTCNow() - build.start_time).days > 0
 
 
 def _CurrentBuildKey(master_name, builder_name, build_number):
   return '%s/%s/%d' % (master_name, builder_name, build_number)
 
 
 def _BlameListsIntersection(blame_list_1, blame_list_2):
@@ skipping 145 matching lines @@
 def _GetOutputNodes(signals):
   if not signals or 'compile' not in signals:
     return []
 
   # Compile failures with no output nodes will be considered unique.
   return signals['compile'].get('failed_output_nodes', [])
 
 
 def _GetMatchingFailureGroups(build_failure_type):
   earliest_time = time_util.GetUTCNow() - timedelta(
-      seconds=MATCHING_GROUPS_SECONDS_AGO)
+      seconds=waterfall_config.GetTryJobSettings().get(
+          'max_seconds_look_back_for_group'))
   return WfFailureGroup.query(ndb.AND(
       WfFailureGroup.created_time >= earliest_time,
       WfFailureGroup.build_failure_type == build_failure_type)).fetch()
 
 
 def _GetMatchingCompileFailureGroups(output_nodes):
   groups = _GetMatchingFailureGroups(failure_type.COMPILE)
   # Output nodes should already be unique and sorted.
   return [group for group in groups if group.output_nodes == output_nodes]
 
@@ skipping 93 matching lines @@
   return False
 
 
 def _NeedANewTestTryJob(
     master_name, builder_name, build_number, failure_info, force_try_job):
   if failure_info['failure_type'] != failure_type.TEST:
     return False
 
   if (not force_try_job and
       waterfall_config.ShouldSkipTestTryJobs(master_name, builder_name)):
-      logging.info('Test try jobs on %s, %s are not supported yet.',
-                   master_name, builder_name)
-      return False
+    logging.info('Test try jobs on %s, %s are not supported yet.',
+                 master_name, builder_name)
+    return False
 
   return _CurrentBuildKeyInFailureResultMap(
       master_name, builder_name, build_number)
 
 
 def NeedANewTryJob(
     master_name, builder_name, build_number, failure_info, signals,
     heuristic_result, force_try_job=False):
 
   tryserver_mastername, tryserver_buildername = (
       waterfall_config.GetTrybotForWaterfallBuilder(master_name, builder_name))
 
   try_job_type = failure_info['failure_type']
   if not tryserver_mastername or not tryserver_buildername:
     logging.info('%s, %s is not supported yet.', master_name, builder_name)
     return False
 
   if not force_try_job:
     build = WfBuild.Get(master_name, builder_name, build_number)
 
     if _ShouldBailOutForOutdatedBuild(build):
       logging.error('Build time %s is more than 24 hours old. '
                     'Try job will not be triggered.' % build.start_time)
       return False
 
-  need_new_try_job = (_NeedANewCompileTryJob(
-      master_name, builder_name, build_number, failure_info)
-      if try_job_type == failure_type.COMPILE else
-      _NeedANewTestTryJob(
-          master_name, builder_name, build_number, failure_info, force_try_job))
+  if try_job_type == failure_type.COMPILE:
+    need_new_try_job = _NeedANewCompileTryJob(
+        master_name, builder_name, build_number, failure_info)
+  else:
+    need_new_try_job = _NeedANewTestTryJob(
+        master_name, builder_name, build_number, failure_info, force_try_job)
 
   if need_new_try_job:
     # TODO(josiahk): Integrate this into need_new_try_job boolean
     _IsBuildFailureUniqueAcrossPlatforms(
         master_name, builder_name, build_number, try_job_type,
         failure_info['builds'][str(build_number)]['blame_list'],
         failure_info['failed_steps'], signals, heuristic_result)
 
   need_new_try_job = need_new_try_job and ReviveOrCreateTryJobEntity(
       master_name, builder_name, build_number, force_try_job)
@@ skipping 13 matching lines @@
       master_name, builder_name)
   for source_target in signals['compile'].get('failed_targets', []):
     # 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