Switch off repo sync --jobs, and turn on repo --trace.

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 re
@@ skipping 29 matching lines @@
 
 
 def RepoSync(buildroot, rw_checkout=False, 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.
 
   """
-  # Get the number of processors to use with repo sync.
-  num_procs = int(RunCommand('grep -c processor /proc/cpuinfo'.split(),
-                             print_cmd=False, redirect_stdout=True))
-
   while retries > 0:
     try:
-      RunCommand(['repo', 'sync', '--jobs=%d' % (num_procs)], cwd=buildroot)
+      # 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', '--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
@@ skipping 333 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()