[Findit] A huge refactoring and some bug fixing.

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.api import modules
 from google.appengine.ext import ndb
 
-from model import wf_analysis_status
+from common import appengine_util
+from common import constants
+from model import analysis_status
 from model.wf_try_job import WfTryJob
 from waterfall import swarming_tasks_to_try_job_pipeline
 from waterfall import waterfall_config
 from waterfall.try_job_type import TryJobType
 
 
-# TODO(chanli): Need to figure out why try-job-queue doesn't work.

[lijeffrey, 2016/04/07 02:57:30]

Does this comment still apply? If so maybe mve this TODO to where
constants.WATERFALL_TRY_JOB_QUEUE is being used near line 173

[stgao, 2016/04/07 04:46:04]

No. The problem was already fixed.

-TRY_JOB_PIPELINE_QUEUE_NAME = 'build-failure-analysis-queue'
-
-
 def _CheckFailureForTryJobKey(
     master_name, builder_name, build_number,
     failure_result_map, failed_step_or_test, failure):
   """Compares the current_failure and first_failure for each failed_step/test.
 
   If equal, a new try_job needs to start;
   If not, apply the key of the first_failure's try_job to this failure.
   """
   # TODO(chanli): Need to compare failures across builders
   # after the grouping of failures is implemented.
@@ skipping 67 matching lines @@
         _CheckIfNeedNewTryJobForTestFailure(
             'step', master_name, builder_name, build_number, failure_result_map,
             failed_steps))
 
   if need_new_try_job:
     try_job = WfTryJob.Get(
         master_name, builder_name, build_number)
 
     if try_job:
       if try_job.failed:
-        try_job.status = wf_analysis_status.PENDING
+        try_job.status = analysis_status.PENDING
         try_job.put()
       else:
         need_new_try_job = False
     else:
       try_job = WfTryJob.Create(
           master_name, builder_name, build_number)
       try_job.put()
 
   return need_new_try_job, last_pass, try_job_type, targeted_tests
 
@@ skipping 45 matching lines @@
                        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))
 
-    pipeline.target = (
-        '%s.build-failure-analysis' % modules.get_current_version_name())
-    pipeline.start(
-        queue_name=TRY_JOB_PIPELINE_QUEUE_NAME)
+    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