[Findit] Post analysis results of flakes to bug filed by chromium-try-flakes.

appengine/findit/model/flake/master_flake_analysis.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 base64
 
 from google.appengine.ext import ndb
 
 from model import analysis_status
 from model.base_analysis import BaseAnalysis
@@ skipping 49 matching lines @@
   @classmethod
   def GetVersion(cls, master_name, builder_name, build_number, step_name,
                  test_name, version=None):  # pragma: no cover.
     return super(MasterFlakeAnalysis, cls).GetVersion(
         key=MasterFlakeAnalysis._CreateAnalysisId(
             master_name, builder_name, build_number, step_name, test_name),
         version=version)
 
   def Reset(self):
     super(MasterFlakeAnalysis, self).Reset()
+    self.original_master_name = None
+    self.original_builder_name = None
+    self.original_build_number = None
+    self.original_step_name = None
+    self.original_test_name = None
+    self.bug_id = None
     self.swarming_rerun_results = []
     self.error = None
     self.correct_regression_range = None
     self.correct_culprit = None
     self.algorithm_parameters = None
     self.suspected_flake_build_number = None
     self.data_points = []
 
+  # The original build/step/test in which a flake actually occurred.
+  # A CQ trybot step has to be mapped to a Waterfall buildbot step.
+  # A gtest suite.PRE_PRE_test has to be normalized to suite.test.
+  original_master_name = ndb.StringProperty(indexed=True)
+  original_builder_name = ndb.StringProperty(indexed=True)
+  original_build_number = ndb.IntegerProperty(indexed=True)
+  original_step_name = ndb.StringProperty(indexed=True)
+  original_test_name = ndb.StringProperty(indexed=True)
+
+  # The bug id in which this flake is reported.
+  bug_id = ndb.IntegerProperty(indexed=True)
+
   # A list of dicts containing information about each swarming rerun's results
   # that were involved in this analysis. The contents of this list will be used
   # for metrics, such as the number of cache hits this analysis benefited from,
   # the number of swarming tasks that were needed end-to-end to find the
   # regressed build number (if any), etc. See FlakeSwarmingTaskData for exact
   # fields.
   swarming_rerun_results = ndb.LocalStructuredProperty(
       FlakeSwarmingTaskData, repeated=True, compressed=True)
 
   # Error code and message, if any.
@@ skipping 17 matching lines @@
   #     'upper_flake_threshold': 0.98
   # }
   algorithm_parameters = ndb.JsonProperty(indexed=False)
 
   # The suspected build number to have introduced the flakiness.
   suspected_flake_build_number = ndb.IntegerProperty()
 
   # The data points used to plot the flakiness graph build over build.
   data_points = ndb.LocalStructuredProperty(
       DataPoint, repeated=True, compressed=True)