Add ability to push to subset of overlays we rev.

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 514 matching lines @@
   """
   public_overlay = '%s/src/third_party/chromiumos-overlay' % buildroot
   private_overlay = '%s/src/private-overlays/chromeos-overlay' % buildroot
   if overlays == 'private':
     paths = [private_overlay]
   elif overlays == 'public':
     paths = [public_overlay]
   elif overlays == 'both':
     paths = [public_overlay, private_overlay]
   else:
-    Die('Incorrect overlay configuration: %s' % overlays)
+    Info('No overlays found.')
+    paths = []
   return paths
 
 
 def _UploadPrebuilts(buildroot, board, overlay_config, binhosts):
   """Upload prebuilts.
 
   Args:
     buildroot: The root directory where the build occurs.
     board: Board type that was built on this machine
     overlay_config: A string describing which overlays you want.
@@ skipping 70 matching lines @@
 
   if len(args) >= 1:
     buildconfig = _GetConfig(args[-1])
   else:
     Warning('Missing configuration description')
     parser.print_usage()
     sys.exit(1)
 
   try:
     # Calculate list of overlay directories.
-    overlays = _ResolveOverlays(buildroot, buildconfig['overlays'])
+    rev_overlays = _ResolveOverlays(buildroot, buildconfig['rev_overlays'])
+    push_overlays = _ResolveOverlays(buildroot, buildconfig['push_overlays'])
+    # We cannot push to overlays that we don't rev.
+    assert set(push_overlays).issubset(set(rev_overlays))

[David James, 2010/12/02 02:06:59]

Maybe we should also check that push_overlays must be empty if the bot is not a
master bot.

[sosa, 2010/12/02 21:47:49]

Done.

+
     board = buildconfig['board']
     old_binhost = None
 
-    _PreFlightRinse(buildroot, buildconfig['board'], tracking_branch, overlays)
+    _PreFlightRinse(buildroot, buildconfig['board'], tracking_branch,
+                    rev_overlays)
     chroot_path = os.path.join(buildroot, 'chroot')
     boardpath = os.path.join(chroot_path, 'build', board)
     if options.sync:
       if options.clobber or not os.path.isdir(buildroot):
         _FullCheckout(buildroot, tracking_branch, url=options.url)
       else:
         old_binhost = _GetPortageEnvVar(buildroot, board, _FULL_BINHOST)
         _IncrementalCheckout(buildroot)
 
     new_binhost = _GetPortageEnvVar(buildroot, board, _FULL_BINHOST)
     if old_binhost and old_binhost != new_binhost:
       RunCommand(['sudo', 'rm', '-rf', boardpath])
 
     # Check that all overlays can be found.
-    for path in overlays:
-      assert ':' not in path, 'Overlay must not contain colons: %s' % path

[David James, 2010/12/02 02:06:59]

Thanks for cleaning this up -- it wasn't terribly useful.

+    for path in rev_overlays:
       if not os.path.isdir(path):
         Die('Missing overlay: %s' % path)
 
     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)
     elif buildconfig['uprev']:
       _UprevPackages(buildroot, tracking_branch, revisionfile,
-                     buildconfig['board'], overlays)
+                     buildconfig['board'], rev_overlays)
 
     _EnableLocalAccount(buildroot)
     # Doesn't rebuild without acquiring more source.
     if options.sync:
       _Build(buildroot)
 
     if chrome_atom_to_build:
       _BuildChrome(buildroot, buildconfig['board'], chrome_atom_to_build)
 
     if buildconfig['unittests'] and options.tests:
       _RunUnitTests(buildroot)
 
     _BuildImage(buildroot)
 
     if buildconfig['smoke_bvt'] and options.tests:
       _BuildVMImageForTesting(buildroot)
       test_results_dir = '/tmp/run_remote_tests.%s' % options.buildnumber
       try:
         _RunSmokeSuite(buildroot, test_results_dir)
       finally:
         if not options.debug:
-          archive_full_path=os.path.join(options.gsutil_archive,
+          archive_full_path = os.path.join(options.gsutil_archive,
                                          str(options.buildnumber))
           _ArchiveTestResults(buildroot, buildconfig['board'],
                               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):
-          _UploadPrebuilts(buildroot, board, buildconfig['overlays'],
+          _UploadPrebuilts(buildroot, board, rev_overlays,

[David James, 2010/12/02 02:06:59]

_UploadPrebuilts expects a string for the third argument, not a list.  I guess
it should be buildconfig['rev_overlays']

[sosa, 2010/12/02 21:47:49]

Done.

                            [new_binhost])
           _UprevPush(buildroot, tracking_branch, buildconfig['board'],
-                     overlays, options.debug)
+                     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()