Update cbuildbot.py to upload prebuilts from preflight buildbot.

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 469 matching lines @@
     paths = [private_overlay]
   elif overlays == 'public':
     paths = [public_overlay]
   elif overlays == 'both':
     paths = [public_overlay, private_overlay]
   else:
     Die('Incorrect overlay configuration: %s' % overlays)
   return paths
 
 
+def _UploadPrebuilts(buildroot, board, overlay_config, master):

[sosa, 2010/11/16 23:48:06]

Missing short docstring

[davidjames, 2010/11/17 00:15:43]

Done.

+  cmd = ['%s/src/scripts/prebuilt.py' % buildroot, '--git-sync',
+         '-p', buildroot, '-b', board, '-V', 'preflight',

[sosa, 2010/11/16 23:48:06]

Please use long options

[davidjames, 2010/11/17 00:15:43]

Done.

+         '-k', 'PREFLIGHT_BINHOST']
+  if overlay_config == 'public':
+    cmd.extend(['-u', 'gs://chromeos-prebuilt'])
+  else:
+    assert overlay_config in ('private', 'both')
+    cmd.extend(['-u', 'chromeos-images:/var/www/prebuilt/',

[sosa, 2010/11/16 23:48:06]

any reason we are not taking these as options and hardcoding them here?

[davidjames, 2010/11/17 00:15:43]

Just discussed this over chat. We're trying to keep options away from buildbot
config because buildbot config is hard to adjust.

+                '-H', 'http://chromeos-prebuilt'])
+
+  if master:
+    cmd.append('--sync-host')
+
+  RunCommand(cmd)
+
+
 def main():
   # Parse options
   usage = "usage: %prog [options] cbuildbot_config"
   parser = optparse.OptionParser(usage=usage)
   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('-f', '--revisionfile',
                     help='file where new revisions are stored')
@@ skipping 60 matching lines @@
     if buildconfig['smoke_bvt']:
       _BuildVMImageForTesting(buildroot)
       test_results_dir = '/tmp/run_remote_tests.%s' % options.buildnumber
       try:
         _RunSmokeSuite(buildroot, test_results_dir)
       finally:
         _ArchiveTestResults(buildroot, buildconfig['board'],
                             archive_dir=options.buildnumber,
                             test_results_dir=test_results_dir)
 
+    if not options.debug:
+      _UploadPrebuilts(buildroot, buildconfig['board'], buildconfig['overlays'],
+                       buildconfig['master'])

[sosa, 2010/11/16 23:48:06]

Better to do this after the uprev i.e. if we can't uprev ... we shouldn't push
the prebuilts.

[davidjames, 2010/11/17 00:15:43]

Done.

+
     if buildconfig['uprev']:
       # Don't push changes for developers.
       if not options.debug:
         if buildconfig['master']:
           # Master bot needs to check if the other slaves completed.
           if cbuildbot_comm.HaveSlavesCompleted(config):
             _UprevPush(buildroot, tracking_branch, buildconfig['board'],
                        overlays)
           else:
             Die('CBUILDBOT - One of the slaves has failed!!!')
 
         else:
           # Publish my status to the master if its expecting it.
           if buildconfig['important']:
             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()