Enhance chromium_tests.configure_build for generalized trybot mirroring

scripts/slave/recipe_modules/chromium_tests/api.py

 # Copyright 2014 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 ast
 import collections
 import contextlib
 import copy
 import itertools
 import json
@@ skipping 55 matching lines @@
     return trybots.TRYBOTS
 
   def add_builders(self, builders):
     """Adds builders to our builder map"""
     self._builders.update(builders)
 
   def _get_bot_config(self, mastername, buildername):
     master_dict = self.builders.get(mastername, {})
     return freeze(master_dict.get('builders', {}).get(buildername))
 
-  def configure_build(self, mastername, buildername, override_bot_type=None):
-    master_dict = self.builders.get(mastername, {})
-    bot_config = master_dict.get('builders', {}).get(buildername)
-
+  def _configure_build(self, bot_config, override_bot_type=None):
     # Get the buildspec version. It can be supplied as a build property or as
     # a recipe config value.
     buildspec_version = (self.m.properties.get('buildspec_version') or
                          bot_config.get('buildspec_version'))
 
     self.m.chromium.set_config(
         bot_config.get('chromium_config'),
         **bot_config.get('chromium_config_kwargs', {}))
 
     # Set GYP_DEFINES explicitly because chromium config constructor does
     # not support that.
     self.m.chromium.c.gyp_env.GYP_DEFINES.update(
         bot_config.get('GYP_DEFINES', {}))
     if bot_config.get('use_isolate'):
       self.m.isolate.set_isolate_environment(self.m.chromium.c)
 
     self.m.gclient.set_config(
         bot_config.get('gclient_config'),
         PATCH_PROJECT=self.m.properties.get('patch_project'),
         BUILDSPEC_VERSION=buildspec_version,
         **bot_config.get('gclient_config_kwargs', {}))
 
-    if 'android_config' in bot_config:
+    if bot_config.get('android_config'):
       self.m.chromium_android.configure_from_properties(
-          bot_config['android_config'],
+          bot_config.get('android_config'),
           **bot_config.get('chromium_config_kwargs', {}))
 
-    if 'amp_config' in bot_config:
-      self.m.amp.set_config(bot_config['amp_config'])
+    if bot_config.get('amp_config'):
+      self.m.amp.set_config(bot_config.get('amp_config'))
 
     for c in bot_config.get('chromium_apply_config', []):
       self.m.chromium.apply_config(c)
 
     for c in bot_config.get('gclient_apply_config', []):
       self.m.gclient.apply_config(c)
 
     # WARNING: src-side runtest.py is only tested with chromium CQ builders.
     # Usage not covered by chromium CQ is not supported and can break
     # without notice.
-    if master_dict.get('settings', {}).get('src_side_runtest_py'):
+    if bot_config.get_master_setting('src_side_runtest_py'):
       self.m.chromium.c.runtest_py.src_side = True
 
     if bot_config.get('goma_canary'):
-      self.m.goma.update_goma_canary(buildername)
+      self.m.goma.update_goma_canary()
 
     bot_type = override_bot_type or bot_config.get('bot_type', 'builder_tester')
 
     if bot_config.get('set_component_rev'):
       # If this is a component build and the main revision is e.g. blink,
       # webrtc, or v8, the custom deps revision of this component must be
       # dynamically set to either:
       # (1) the revision of the builder if this is a tester,
       # (2) 'revision' from the waterfall, or
       # (3) 'HEAD' for forced builds with unspecified 'revision'.
       # TODO(machenbach): Use parent_got_cr_revision on testers with component
       # builds to match also the chromium revision from the builder.
       component_rev = self.m.properties.get('revision') or 'HEAD'
       if bot_type == 'tester':
         component_rev = self.m.properties.get(
             'parent_got_revision', component_rev)
       dep = bot_config.get('set_component_rev')
       self.m.gclient.c.revisions[dep['name']] = dep['rev_str'] % component_rev
 
+  def configure_build(self, mastername, buildername, override_bot_type=None):
+    self._configure_build(
+        bdb_module.BotConfig(
+            self.builders,

[Sergiy Byelozyorov, 2016/01/12 15:03:56]

Where is this populated? Is it always guaranteed to contain compatible bot
configs? If someone adds a bot that is incompatible - will presubmit catch that?

[Paweł Hajdan Jr., 2016/01/12 15:05:38]

We rely on existing assumptions - the original code was also referring to
self.builders. This patch does not change that.
Yes, that's why this patch adds asserts.

[Sergiy Byelozyorov, 2016/01/12 15:10:28]

Thanks for pointing this out. I didn't notice it at first.
Great. I just wasn't sure if they will be triggered by some tests.

+            [{'mastername': mastername, 'buildername': buildername}]
+        ), override_bot_type)
+
   def ensure_checkout(self, mastername, buildername,
                       root_solution_revision=None):
     bot_config = self._get_bot_config(mastername, buildername)
 
     if self.m.platform.is_win:
       self.m.chromium.taskkill()
 
     # Bot Update re-uses the gclient configs.
     update_step = self.m.bot_update.ensure_checkout(
         patch_root=bot_config.get('patch_root'),
@@ skipping 740 matching lines @@
       result_text = 'MB is enabled for this builder at this revision.'
       log_name = 'Builder MB-ready'
       self.m.step.active_result.presentation.logs[log_name] = [result_text]
       return False
     except (self.m.step.StepFailure, KeyError):
       result_text = 'MB is not enabled for this builder at this revision.'
       log_name = 'Builder NOT MB-ready'
       self.m.step.active_result.presentation.logs[log_name] = [result_text]
       self.m.step.active_result.presentation.status = self.m.step.WARNING
       return True