[Findit] Adding support for disabling test try jobs for given master/builder

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 134 matching lines @@
 
 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 = (
       waterfall_config.GetTrybotForWaterfallBuilder(master_name, builder_name))
+
   if not tryserver_mastername or not tryserver_buildername:
     logging.info('%s, %s is not supported yet.', master_name, builder_name)
     return {}
 
   failure_result_map = {}
   need_new_try_job, last_pass, try_job_type, targeted_tests = (
       _NeedANewTryJob(master_name, builder_name, build_number,

[stgao, 2016/04/16 06:33:15]

If _NeedANewTryJob is run, a TryJob entity is created already.
We need to fix this.

[lijeffrey, 2016/04/18 21:40:41]

Addressed in https://codereview.chromium.org/1898003002/

                       failed_steps, failure_result_map))
 
+  if (try_job_type == TryJobType.TEST 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 {}
+
   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)
+        if try_job_type == TryJobType.COMPILE else None)
 
     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 = (
           'Swarming task was scheduled for build %s, %s, %s: %s because of'
           ' %s failure. A try job may be triggered if some reliable failure'
           ' is detected in the task.') % (
               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