Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1755)

Unified Diff: appengine/findit/waterfall/identify_try_job_culprit_pipeline.py

Issue 1591003002: [Findit] Modify tryjob pipelines to trigger try jobs for test failure. (Closed) Base URL: https://chromium.googlesource.com/infra/infra.git@master
Patch Set: Simplify the format for final try-job result for test failures. Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: appengine/findit/waterfall/identify_try_job_culprit_pipeline.py
diff --git a/appengine/findit/waterfall/identify_try_job_culprit_pipeline.py b/appengine/findit/waterfall/identify_try_job_culprit_pipeline.py
index 873db7b33193b2f654898b808481ec07e649e6ce..5c727c84740a96a2484ee4cadb7d89f7dad8c450 100644
--- a/appengine/findit/waterfall/identify_try_job_culprit_pipeline.py
+++ b/appengine/findit/waterfall/identify_try_job_culprit_pipeline.py
@@ -7,47 +7,114 @@ from common.http_client_appengine import HttpClientAppengine as HttpClient
from model import wf_analysis_status
from model.wf_try_job import WfTryJob
from pipeline_wrapper import BasePipeline
+from waterfall.try_job_enums import TryJobType
+
+
+GIT_REPO = GitRepository(
+ 'https://chromium.googlesource.com/chromium/src.git', HttpClient())
class IdentifyTryJobCulpritPipeline(BasePipeline):
"""A pipeline to identify culprit CL info based on try job compile results."""
+ def _GetCulpritInfo(self, failed_revisions):
+ """Gets commit_positions and review_urls for revisions."""
+ culprits = {}
+ for failed_revision in failed_revisions:
+ change_log = GIT_REPO.GetChangeLog(failed_revision)
+ if change_log:
stgao 2016/01/29 18:55:01 If the request to Gitiles fails for some reason, d
chanli 2016/01/30 02:22:37 Yes i think we should return the hash anyway.
+ culprits[failed_revision] = {
+ 'revision': failed_revision,
+ 'commit_position': change_log.commit_position,
+ 'review_url': change_log.code_review_url
+ }
+ return culprits
+
+ def _FindCulpritForEachTestFailure(self, blame_list, result):
+ # For test failures, the try job will run against every revision,
+ # so we need to traverse the result dict in chronological order to identify
+ # the culprits for each failed step or test.
+ culprit_map = {}
+ failed_revisions = []
+ for revision in blame_list:
+ for step, step_result in result['result'][revision].iteritems():
+ if step_result['valid'] and step_result['status'] == 'failed':
+ if revision not in failed_revisions:
+ failed_revisions.append(revision)
+
+ if step not in culprit_map:
+ culprit_map[step] = {
+ 'tests': {}
+ }
+
+ if (not step_result['failures'] and
+ not culprit_map[step].get('revision')):
+ # Non swarming test failures, only have step level failure info.
+ culprit_map[step]['revision'] = revision
+
+ for failed_test in step_result['failures']:
+ # Swarming tests, gets first failed revision for each test.
+ if failed_test not in culprit_map[step]['tests']:
+ culprit_map[step]['tests'][failed_test] = {
+ 'revision': revision
+ }
+ return culprit_map, failed_revisions
+
+ def _UpdateCulpritMapWithCulpritInfo(self, culprit_map, culprits):
+ """Fills in commit_position and review_url for each failed rev in map."""
+ for step_culprit in culprit_map.values():
+ if step_culprit.get('revision'):
+ culprit = culprits[step_culprit['revision']]
+ step_culprit['commit_position'] = culprit['commit_position']
+ step_culprit['review_url'] = culprit['review_url']
+ for test_culprit in step_culprit.get('tests', {}).values():
+ test_revision = test_culprit['revision']
+ test_culprit.update(culprits[test_revision])
stgao 2016/01/29 18:55:02 If line #25 is false, this will cause an exception
chanli 2016/01/30 02:22:37 Made the change to include revision, this is fine
+
# Arguments number differs from overridden method - pylint: disable=W0221
def run(
lijeffrey 2016/01/29 19:49:46 you may want to do a rebase, a lot of code has cha
chanli 2016/01/30 02:22:37 Done.
- self, master_name, builder_name, build_number, try_job_id,
- compile_result):
- culprit = None
-
- if compile_result and len(compile_result.get('result', [])) > 0:
- # For compile failures, the try job will stop if one revision fails, so
- # the culprit will be the last revision in the result.
- result_for_last_checked_revision = compile_result['result'][-1]
- failed_revision = (
- result_for_last_checked_revision[0] if
- result_for_last_checked_revision[1].lower() == 'failed' else None)
-
- if failed_revision:
- git_repo = GitRepository(
- 'https://chromium.googlesource.com/chromium/src.git', HttpClient())
- change_log = git_repo.GetChangeLog(failed_revision)
- if change_log:
- culprit = {
- 'revision': failed_revision,
- 'commit_position': change_log.commit_position,
- 'review_url': change_log.code_review_url
- }
- compile_result['culprit'] = culprit
+ self, master_name, builder_name, build_number, blame_list, try_job_type,
+ try_job_id, result):
+ """Identifies the information for failed revisions.
+
+ Please refer to try_job_result_format.md for format check.
+ """
+ culprits = None
+
+ if result and result.get('result'):
+ if try_job_type == TryJobType.COMPILE:
+ # For compile failures, the try job will stop if one revision fails, so
+ # the culprit will be the last revision in the result.
+ result_for_last_checked_revision = result['result'][-1]
+ failed_revisions = (
+ [result_for_last_checked_revision[0]] if
+ result_for_last_checked_revision[1].lower() == 'failed' else [])
+
+ culprits = self._GetCulpritInfo(failed_revisions)
+ if culprits:
+ result['culprit'] = culprits[failed_revisions[0]]
+ else: # try_job_type is 'test'.
+ culprit_map, failed_revisions = self._FindCulpritForEachTestFailure(
+ blame_list, result)
+ culprits = self._GetCulpritInfo(failed_revisions)
+ if culprits:
+ self._UpdateCulpritMapWithCulpritInfo(culprit_map, culprits)
+ result['culprit'] = culprit_map
# Store try job results.
try_job_result = WfTryJob.Get(master_name, builder_name, build_number)
- if culprit:
- if (try_job_result.compile_results and
- try_job_result.compile_results[-1]['try_job_id'] == try_job_id):
- try_job_result.compile_results[-1].update(compile_result)
+ if culprits:
+ result_to_update = (
+ try_job_result.compile_results if
+ try_job_type == TryJobType.COMPILE else
+ try_job_result.test_results)
+ if (result_to_update and
+ result_to_update[-1]['try_job_id'] == try_job_id):
+ result_to_update[-1].update(result)
else: # pragma: no cover
- try_job_result.compile_results.append(compile_result)
+ result_to_update.append(result)
try_job_result.status = wf_analysis_status.ANALYZED
try_job_result.put()
- return culprit
+ return result.get('culprit', None) if result else None

Powered by Google App Engine
This is Rietveld 408576698