Keep repo using http on incremental builds

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.
 
 import errno
 import optparse
 import os
 import shutil
@@ skipping 35 matching lines @@
 
 def MakeDir(path, parents=False):
   try:
     os.makedirs(path)
   except OSError,e:
     if e.errno == errno.EEXIST and parents:
       pass
     else:
       raise
 
-def RepoSync(buildroot, retries=_DEFAULT_RETRIES):
+def RepoSync(buildroot, rw_checkout, retries=_DEFAULT_RETRIES):
   while retries > 0:
     try:
       RunCommand(['repo', '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://src.chromium.org/git'], cwd=buildroot)

[Mandeep Singh Baines, 2010/08/19 22:57:07]

What this is doing is telling git to use ssh instead of http for pushing. It
should have no impact on checkout (i.e. pulling) speed.

       retries = 0
     except:
       retries -= 1
       if retries > 0:
         print >>sys.stderr, 'CBUILDBOT -- Repo Sync Failed, retrying'
       else:
         print >>sys.stderr, 'CBUILDBOT -- Retries exhausted'
         raise
 
 # Main functions
 
 def _FullCheckout(buildroot, rw_checkout=True, retries=_DEFAULT_RETRIES):
   RunCommand(['sudo', 'rm', '-rf', buildroot])
   MakeDir(buildroot, parents=True)
   RunCommand(['repo', 'init', '-u', 'http://src.chromium.org/git/manifest'],
              cwd=buildroot, input='\n\ny\n')
-  RepoSync(buildroot, retries)
-  if rw_checkout:
-    RunCommand(['repo', 'forall', '-c', 'git', 'config',
-                'url.ssh://git@gitrw.chromium.org:9222.pushinsteadof',
-               'http://src.chromium.org/git'], cwd=buildroot)
+  RepoSync(buildroot, rw_checkout, retries)
 
-def _IncrementalCheckout(buildroot, retries=_DEFAULT_RETRIES):
-  RepoSync(buildroot, retries)
-  # 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://src.chromium.org/git'], cwd=buildroot)
+def _IncrementalCheckout(buildroot, rw_checkout=True,
+                         retries=_DEFAULT_RETRIES):
+  RepoSync(buildroot, rw_checkout, retries)
 
 def _MakeChroot(buildroot):
   cwd = os.path.join(buildroot, 'src', 'scripts')
   RunCommand(['./make_chroot', '--fast'], cwd=cwd)
 
 def _SetupBoard(buildroot, board='x86-generic'):
   cwd = os.path.join(buildroot, 'src', 'scripts')
   RunCommand(['./setup_board', '--fast', '--default', '--board=%s' % board],
              cwd=cwd)
 
@@ skipping 64 matching lines @@
     if buildconfig['uprev']:
       _UprevPush(buildroot)
       _UprevCleanup(buildroot)
   except:
     # something went wrong, cleanup (being paranoid) for next build
     RunCommand(['sudo', 'rm', '-rf', buildroot])
     raise
 
 if __name__ == '__main__':
     main()