Remove bogus master/builder/slave/force parameters from bot_update.

recipe_modules/bot_update/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.
 
 
 """Recipe module to ensure a checkout is consistant on a bot."""
 
 from recipe_engine import recipe_api
 
 
 class BotUpdateApi(recipe_api.RecipeApi):
 
-  def __init__(self, mastername, buildername, slavename, issue, patchset,
-               repository, gerrit_ref, rietveld, revision, parent_got_revision,
-               deps_revision_overrides, fail_patch, *args, **kwargs):
-    self._mastername = mastername
-    self._buildername = buildername
-    self._slavename = slavename
+  def __init__(self, issue, patchset, repository, gerrit_ref, rietveld,
+               revision, parent_got_revision, deps_revision_overrides,
+               fail_patch, *args, **kwargs):
     self._issue = issue
     self._patchset = patchset
     self._repository = repository
     self._gerrit_ref = gerrit_ref
     self._rietveld = rietveld
     self._revision = revision
     self._parent_got_revision = parent_got_revision
     self._deps_revision_overrides = deps_revision_overrides
     self._fail_patch = fail_patch
 
@@ skipping 58 matching lines @@
       patchset: The rietveld issue patchset to use. If omitted, will infer from
         the 'patchset' property.
     """
     refs = refs or []
     # We can re-use the gclient spec from the gclient module, since all the
     # data bot_update needs is already configured into the gclient spec.
     cfg = gclient_config or self.m.gclient.c
     assert cfg is not None, (
         'missing gclient_config or forgot api.gclient.set_config(...) before?')
 
-    # Used by bot_update to determine if we want to run or not.
-    master = self._mastername
-    builder = self._buildername
-    slave = self._slavename
-
     # Construct our bot_update command.  This basically be inclusive of
     # everything required for bot_update to know:
     root = patch_root
     if root is None:
       root = self.m.gclient.calculate_patch_root(
           self.m.properties.get('patch_project'), cfg)
 
     if patch:
       issue = issue or self._issue
       patchset = patchset or self._patchset
@@ skipping 35 matching lines @@
 
     # Allow patch_project's revision if necessary.
     # This is important for projects which are checked out as DEPS of the
     # gclient solution.
     self.m.gclient.set_patch_project_revision(
         self.m.properties.get('patch_project'), cfg)
 
     rev_map = cfg.got_revision_mapping.as_jsonish()
 
     flags = [
-        # 1. Do we want to run? (master/builder/slave).
-        ['--master', master],
-        ['--builder', builder],
-        ['--slave', slave],
-
-        # 2. What do we want to check out (spec/root/rev/rev_map).
+        # What do we want to check out (spec/root/rev/rev_map).
         ['--spec', self.m.gclient.config_to_pythonish(cfg)],
         ['--root', root],
         ['--revision_mapping_file', self.m.json.input(rev_map)],
         ['--git-cache-dir', cfg.cache_dir],
 
-        # 3. How to find the patch, if any (issue/patchset).
+        # How to find the patch, if any (issue/patchset).
         ['--issue', issue],
         ['--patchset', patchset],
         ['--rietveld_server', rietveld or self._rietveld],
         ['--gerrit_repo', gerrit_repo],
         ['--gerrit_ref', gerrit_ref],
         ['--apply_issue_email_file', email_file],
         ['--apply_issue_key_file', key_file],
 
-        # 4. Hookups to JSON output back into recipes.
+        # Hookups to JSON output back into recipes.
         ['--output_json', self.m.json.output()],]
 
 
     # Collect all fixed revisions to simulate them in the json output.
     # Fixed revision are the explicit input revisions of bot_update.py, i.e.
     # every command line parameter "--revision name@value".
     fixed_revisions = {}
 
     revisions = {}
     for solution in cfg.solutions:
@@ skipping 33 matching lines @@
     if with_branch_heads or cfg.with_branch_heads:
       cmd.append('--with_branch_heads')
     if gerrit_no_reset:
       cmd.append('--gerrit_no_reset')
     if gerrit_no_rebase_patch_ref:
       cmd.append('--gerrit_no_rebase_patch_ref')
 
     # Inject Json output for testing.
     first_sln = cfg.solutions[0].name
     step_test_data = lambda: self.test_api.output_json(
-        master, builder, slave, root, first_sln, rev_map, self._fail_patch,
+        root, first_sln, rev_map, self._fail_patch,
         output_manifest=output_manifest, fixed_revisions=fixed_revisions)
 
     # Add suffixes to the step name, if specified.
     name = 'bot_update'
     if not patch:
       name += ' (without patch)'
     if suffix:
       name += ' - %s' % suffix
 
     # Ah hah! Now that everything is in place, lets run bot_update!
@@ skipping 54 matching lines @@
 
         # bot_update actually just sets root to be the folder name of the
         # first solution.
         if step_result.json.output['did_run']:
           co_root = step_result.json.output['root']
           cwd = kwargs.get('cwd', self.m.path['slave_build'])
           if 'checkout' not in self.m.path:
             self.m.path['checkout'] = cwd.join(*co_root.split(self.m.path.sep))
 
     return step_result