Reconfigure to use ssh connection rather than use different manifest.

bin/cbuildbot.py

 #!/usr/bin/python
 
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """CBuildbot is wrapper around the build process used by the pre-flight queue"""
 
 import errno
 import heapq
@@ skipping 27 matching lines @@
   """
   try:
     os.makedirs(path)
   except OSError, e:
     if e.errno == errno.EEXIST and parents:
       pass
     else:
       raise
 
 
-def RepoSync(buildroot, rw_checkout=False, retries=_DEFAULT_RETRIES):
+def RepoSync(buildroot, retries=_DEFAULT_RETRIES):
   """Uses repo to checkout the source code.
 
   Keyword arguments:
-  rw_checkout -- Reconfigure repo after sync'ing to read-write.
   retries -- Number of retries to try before failing on the sync.
-
   """
   while retries > 0:
     try:
       # The --trace option ensures that repo shows the output from git. This
       # is needed so that the buildbot can kill us if git is not making
       # progress.
+      RunCommand(['repo', 'forall', '-c', 'git', 'config',
+                  'url.ssh://git@gitrw.chromium.org:9222.insteadof',
+                  'http://git.chromium.org/git'], cwd=buildroot)
       RunCommand(['repo', '--trace', 'sync'], cwd=buildroot)
-      if rw_checkout:
-        # Always re-run in case of new git repos or repo sync
-        # failed in a previous run because of a forced Stop Build.
-        RunCommand(['repo', 'forall', '-c', 'git', 'config',
-                    'url.ssh://git@gitrw.chromium.org:9222.pushinsteadof',
-                    'http://git.chromium.org/git'], cwd=buildroot)
-
       retries = 0
     except:
       retries -= 1
       if retries > 0:
         Warning('CBUILDBOT -- Repo Sync Failed, retrying')
       else:
         Warning('CBUILDBOT -- Retries exhausted')
         raise
 
   # Output manifest
@@ skipping 201 matching lines @@
 # =========================== Main Commands ===================================
 
 
 def _PreFlightRinse(buildroot, board, tracking_branch, overlays):
   """Cleans up any leftover state from previous runs."""
   _GitCleanup(buildroot, board, tracking_branch, overlays)
   _CleanUpMountPoints(buildroot)
   RunCommand(['sudo', 'killall', 'kvm'], error_ok=True)
 
 
-def _FullCheckout(buildroot, tracking_branch, rw_checkout=True,
+def _FullCheckout(buildroot, tracking_branch,
                   retries=_DEFAULT_RETRIES,
                   url='http://git.chromium.org/git/manifest'):
   """Performs a full checkout and clobbers any previous checkouts."""
   RunCommand(['sudo', 'rm', '-rf', buildroot])
   MakeDir(buildroot, parents=True)
   branch = tracking_branch.split('/');
   RunCommand(['repo', 'init', '-u',
              url, '-b',
              '%s' % branch[-1]], cwd=buildroot, input='\n\ny\n')
-  RepoSync(buildroot, rw_checkout, retries)
+  RepoSync(buildroot, retries)
 
 
-def _IncrementalCheckout(buildroot, rw_checkout=True,
-                         retries=_DEFAULT_RETRIES):
+def _IncrementalCheckout(buildroot, retries=_DEFAULT_RETRIES):
   """Performs a checkout without clobbering previous checkout."""
-  RepoSync(buildroot, rw_checkout, retries)
+  RepoSync(buildroot, retries)
 
 
 def _MakeChroot(buildroot):
   """Wrapper around make_chroot."""
   cwd = os.path.join(buildroot, 'src', 'scripts')
   RunCommand(['./make_chroot', '--fast'], cwd=cwd)
 
 
 def _SetupBoard(buildroot, board='x86-generic'):
   """Wrapper around setup_board."""
@@ skipping 327 matching lines @@
   except:
     # Send failure to master bot.
     if not buildconfig['master'] and buildconfig['important']:
       cbuildbot_comm.PublishStatus(cbuildbot_comm.STATUS_BUILD_FAILED)
 
     raise
 
 
 if __name__ == '__main__':
     main()