Remove parsing of %(branch) as it is not reliable from the buildbot waterfall.

scripts/master/factory/chromeos_factory.py

 # Copyright (c) 2011 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.
 
 """Set of utilities to build the chromium master."""
 
 import os
 
 from buildbot.steps import trigger, shell
 from buildbot.process.properties import WithProperties
@@ skipping 65 matching lines @@
 
     Args:
       repo: ssh: uri for the repo to be checked out
       patch: object with url and ref to patch on top
     """
     git_bin = '/usr/bin/git'
     git_checkout_dir = os.path.basename(repo).replace('.git', '')
     clear_and_clone_cmd = 'rm -rf %s ; sleep 10 ;' % git_checkout_dir
     clear_and_clone_cmd += '%s clone %s;cd %s;' % (git_bin, repo,
                                                    git_checkout_dir)
-    # It's possible that branch can be coming from WithProperites set
-    # If the branch is master, then even if the branch is empty, it amounts
-    # to the same 'git checkout' or 'git checkout master'
-    # If self.branch is set to something otherthan master, that means, branch
-    # has been passed in and we want to honor the explicitly passed in branch
-    clear_and_clone_cmd += '%s checkout ' % git_bin
-    if self.branch == 'master':
-      clear_and_clone_cmd += '%(branch)s'
-    else:
-      clear_and_clone_cmd += self.branch
 
+    # We ignore branches coming from buildbot triggers and rely on those in the
+    # config.  This is because buildbot branch names do not match up with
+    # cros builds.
+    clear_and_clone_cmd += '%s checkout %s' % (git_bin, self.branch)
     msg = 'Clear and Clone %s' % git_checkout_dir
     if patch:
       clear_and_clone_cmd += ('; %s pull %s %s' %
                               (git_bin, patch['url'], patch['ref']))
       msg = 'Clear, Clone and Patch %s' % git_checkout_dir
 
     self.f_cbuild.addStep(shell.ShellCommand,
-                          command=WithProperties(clear_and_clone_cmd),
+                          command=clear_and_clone_cmd,
                           name=msg,
                           description=msg)
 
   def add_bootstrap_steps(self):
     """Bootstraps Chromium OS Build by syncing pre-requisite repositories.
 
     * gclient sync of /b
     * clearing of chromite[& crostools]
     * clean checkout of chromite[& crostools]
     """
@@ skipping 53 matching lines @@
     self.f_cbuild.addStep(chromium_step.AnnotatedCommand,
                           command=cmd,
                           timeout=self.timeout,
                           name='cbuildbot',
                           description=description,
                           usePTY=False)
 
   def get_factory(self):
     """Returns the produced factory."""
     return self.f_cbuild