[Findit] Fix a bug that MonitorTryJobPipeline still runs when no try job scheduled.

appengine/findit/waterfall/start_try_job_on_demand_pipeline.py

 # Copyright 2016 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 common.pipeline_wrapper import BasePipeline
 from common.waterfall import failure_type
 from waterfall import try_job_util
 from waterfall.identify_try_job_culprit_pipeline import (
@@ skipping 81 matching lines @@
     bad_revision = failure_info['builds'][str(build_number)][
         'chromium_revision']
     suspected_revisions = _GetSuspectsFromHeuristicResult(heuristic_result)
 
     if try_job_type == failure_type.COMPILE:
       compile_targets = try_job_util.GetFailedTargetsFromSignals(
           signals, master_name, builder_name)
       try_job_id = yield ScheduleCompileTryJobPipeline(
           master_name, builder_name, build_number, good_revision, bad_revision,
           try_job_type, compile_targets, suspected_revisions)
-      try_job_result = yield MonitorTryJobPipeline(
-          master_name, builder_name, build_number, try_job_type, try_job_id)
-      yield IdentifyTryJobCulpritPipeline(
-          master_name, builder_name, build_number, blame_list, try_job_type,
-          try_job_id, try_job_result)
+      # try_job_result = yield MonitorTryJobPipeline(
+      #     master_name, builder_name, build_number, try_job_type, try_job_id)
+      # yield IdentifyTryJobCulpritPipeline(
+      #     master_name, builder_name, build_number, blame_list, try_job_type,
+      #     try_job_id, try_job_result)

[Sharu Jiang, 2016/08/29 20:53:20]

Should these lines be removed?

[stgao, 2016/08/29 21:07:11]

+1

[chanli, 2016/08/29 21:27:13]

Oops, done.

     else:
       # If try_job_type is other type, the pipeline has returned.
       # So here the try_job_type is failure_type.TEST.
 
       # Waits and gets the swarming tasks' results.
       reliable_tests = []
       for step_name, step_failure in failure_info['failed_steps'].iteritems():
         step_has_first_time_failure = _HasFirstTimeFailure(
             step_failure['tests'], build_number)
         if not step_has_first_time_failure:
           continue
         task_result = yield ProcessSwarmingTaskResultPipeline(
             master_name, builder_name, build_number, step_name)
         reliable_tests.append(task_result)
 
       try_job_id = yield ScheduleTestTryJobPipeline(
           master_name, builder_name, build_number, good_revision, bad_revision,
           try_job_type, suspected_revisions, *reliable_tests)
-      try_job_result = yield MonitorTryJobPipeline(
-          master_name, builder_name, build_number, try_job_type, try_job_id)
-      yield IdentifyTryJobCulpritPipeline(
-          master_name, builder_name, build_number, blame_list, try_job_type,
-          try_job_id, try_job_result)
+
+    try_job_result = yield MonitorTryJobPipeline(
+        master_name, builder_name, build_number, try_job_type, try_job_id)
+    yield IdentifyTryJobCulpritPipeline(
+        master_name, builder_name, build_number, blame_list, try_job_type,
+        try_job_id, try_job_result)