Add support to pushing unstable changes for the chrome pfq.

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 398 matching lines @@
   cmd = ['./build_packages']
   if emptytree:
     cmd.insert(0, 'EXTRA_BOARD_FLAGS=--emptytree')
 
   RunCommand(cmd, cwd=cwd, enter_chroot=True)
 
 
 def _BuildChrome(buildroot, board, chrome_atom_to_build):
   """Wrapper for emerge call to build Chrome."""
   cwd = os.path.join(buildroot, 'src', 'scripts')
-  RunCommand(['emerge-%s' % board, '=%s' % chrome_atom_to_build],
+  RunCommand(['ACCEPT_KEYWORDS="* ~*"', 'emerge-%s' % board,
+              '=%s' % chrome_atom_to_build],
              cwd=cwd, enter_chroot=True)
 
 
 def _EnableLocalAccount(buildroot):
   cwd = os.path.join(buildroot, 'src', 'scripts')
   # Set local account for test images.
   RunCommand(['./enable_localaccount.sh',
              'chronos'],
              print_cmd=False, cwd=cwd)
 
@@ skipping 204 matching lines @@
     cmd.extend(['--upload', 'chromeos-images:/var/www/prebuilt/',
                 '--binhost-base-url', 'http://chromeos-prebuilt'])
 
   RunCommand(cmd, cwd=cwd)
 
 
 def main():
   # Parse options
   usage = "usage: %prog [options] cbuildbot_config"
   parser = optparse.OptionParser(usage=usage)
+  parser.add_option('-a', '--acl', default='private',
+                    help='ACL to set on GSD archives')
   parser.add_option('-r', '--buildroot',
                     help='root directory where build occurs', default=".")
   parser.add_option('-n', '--buildnumber',
                     help='build number', type='int', default=0)
   parser.add_option('--chrome_rev', default=None, type='string',
                     dest='chrome_rev',
                     help=('Chrome_rev of type [tot|latest_release|'
                           'sticky_release]'))
-  parser.add_option('-f', '--revisionfile',
-                    help='file where new revisions are stored')
+  parser.add_option('-g', '--gsutil', default='', help='Location of gsutil')
+  parser.add_option('-c', '--gsutil_archive', default='',
+                    help='Datastore archive location')
   parser.add_option('--clobber', action='store_true', dest='clobber',
                     default=False,
                     help='Clobbers an old checkout before syncing')
   parser.add_option('--debug', action='store_true', dest='debug',
                     default=False,
                     help='Override some options to run as a developer.')
+  parser.add_option('--noprebuilts', action='store_false', dest='prebuilts',
+                    help="Don't upload prebuilts.")
   parser.add_option('--nosync', action='store_false', dest='sync',
                     default=True,
                     help="Don't sync before building.")
   parser.add_option('--notests', action='store_false', dest='tests',
                     default=True,
                     help='Override values from buildconfig and run no tests.')
+  parser.add_option('-f', '--revisionfile',
+                    help='file where new revisions are stored')
   parser.add_option('-t', '--tracking-branch', dest='tracking_branch',
                     default='cros/master', help='Run the buildbot on a branch')
   parser.add_option('-u', '--url', dest='url',
                     default='http://git.chromium.org/git/manifest',
                     help='Run the buildbot on internal manifest')
-  parser.add_option('-g', '--gsutil', default='', help='Location of gsutil')
-  parser.add_option('-c', '--gsutil_archive', default='',
-                    help='Datastore archive location')
-  parser.add_option('-a', '--acl', default='private',
-                    help='ACL to set on GSD archives')
 
   (options, args) = parser.parse_args()
 
   buildroot = os.path.abspath(options.buildroot)
   revisionfile = options.revisionfile
   tracking_branch = options.tracking_branch
   chrome_atom_to_build = None
 
   if len(args) >= 1:
     buildconfig = _GetConfig(args[-1])
@@ skipping 38 matching lines @@
     if not os.path.isdir(chroot_path):
       _MakeChroot(buildroot)
 
     if not os.path.isdir(boardpath):
       _SetupBoard(buildroot, board=buildconfig['board'])
 
     # Perform uprev.  If chrome_uprev is set, rev Chrome ebuilds.
     if options.chrome_rev:
       chrome_atom_to_build = _MarkChromeAsStable(buildroot, tracking_branch,
                                                  options.chrome_rev)
+      # If we found nothing to rev, we're done here.
+      if not chrome_atom_to_build:
+        return
+
     elif buildconfig['uprev']:
       _UprevPackages(buildroot, tracking_branch, revisionfile,
                      buildconfig['board'], rev_overlays)
 
     _EnableLocalAccount(buildroot)
     # Doesn't rebuild without acquiring more source.
     if options.sync:
       _Build(buildroot, emptytree)
 
     if chrome_atom_to_build:
@@ skipping 17 matching lines @@
                               test_results_dir=test_results_dir,
                               gsutil=options.gsutil,
                               archive_dir=archive_full_path,
                               acl=options.acl)
 
     if buildconfig['uprev']:
       # Don't push changes for developers.
       if buildconfig['master']:
         # Master bot needs to check if the other slaves completed.
         if cbuildbot_comm.HaveSlavesCompleted(config):
-          if not options.debug:
+          if not options.debug and options.prebuilts:
             _UploadPrebuilts(buildroot, board, buildconfig['rev_overlays'],
                              [new_binhost])
           _UprevPush(buildroot, tracking_branch, buildconfig['board'],
                      push_overlays, options.debug)
         else:
           Die('CBUILDBOT - One of the slaves has failed!!!')
 
       else:
         # Publish my status to the master if its expecting it.
         if buildconfig['important'] and not options.debug:
           cbuildbot_comm.PublishStatus(cbuildbot_comm.STATUS_BUILD_COMPLETE)
 
   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()