Support variable substitution and tryserver- and waterfall-only cmd line args.

scripts/slave/recipe_modules/chromium_tests/bot_config_and_test_db.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 ast
 import copy
 
 from recipe_engine.types import freeze
 
 
@@ skipping 52 matching lines @@
       return { buildername: bot_config['test_spec'] }
 
     test_spec_file = bot_config.get('testing', {}).get(
         'test_spec_file', '%s.json' % mastername)
 
     # TODO(phajdan.jr): Bots should have no generators instead.
     if bot_config.get('disable_tests'):
       return {}
     return chromium_tests_api.read_test_spec(chromium_tests_api.m, test_spec_file)
 
-  def initialize_bot_db(self, chromium_tests_api, bot_db):
+  def initialize_bot_db(self, chromium_tests_api, bot_db, bot_update_step):
     # TODO(phajdan.jr): Make this work for more than 1 bot.
     assert len(self._bot_ids) == 1
 
     bot_config = self._get_bot_config(self._bot_ids[0])
     mastername = self._bot_ids[0]['mastername']
     buildername = self._bot_ids[0]['buildername']
 
     test_spec = self._get_test_spec(chromium_tests_api)
 
     # TODO(phajdan.jr): Bots should have no generators instead.
@@ skipping 12 matching lines @@
       builder_dict = builders[loop_buildername] = (
           dict(builders[loop_buildername]))
       builders[loop_buildername]['tests'] = (
           chromium_tests_api.generate_tests_from_test_spec(
               chromium_tests_api.m, test_spec, builder_dict,
               loop_buildername, mastername,
               # TODO(phajdan.jr): Get enable_swarming value from builder_dict.
               # Above should remove the need to get bot_config and buildername
               # in this method.
               bot_config.get('enable_swarming', False),
-              scripts_compile_targets, builder_dict.get('test_generators', [])
+              scripts_compile_targets, builder_dict.get('test_generators', []),
+              bot_update_step
           ))
 
     bot_db._add_master_dict_and_test_spec(
         mastername, freeze(master_dict), freeze(test_spec))
 
   def should_force_legacy_compiling(self, chromium_tests_api):
     """Determines if a given chromium revision needs to be built with gyp.
 
     This is done by checking the contents of tools/mb/mb_config.pyl at the rev.
 
@@ skipping 104 matching lines @@
     """A generator of all the (buildername, bot_config) tuples whose
     parent_buildername is the passed one on the given master.
     """
     for buildername, bot_config in self._db[mastername]['master_dict'].get(
         'builders', {}).iteritems():
       if bot_config.get('parent_buildername') == parent_buildername:
         yield buildername, bot_config
 
   def get_test_spec(self, mastername, buildername):
     return self._db[mastername]['test_spec'].get(buildername, {})