Update cbuildbot.py to upload prebuilts from preflight buildbot.

bin/cbuildbot.py

Index: bin/cbuildbot.py
diff --git a/bin/cbuildbot.py b/bin/cbuildbot.py
index e723cd64396b9d2156b12bf04375d01429e2cd89..29b5294d724c642366f4f01ab9f50b6e5e8115c6 100755
--- a/bin/cbuildbot.py
+++ b/bin/cbuildbot.py
@@ -487,6 +487,23 @@ def _ResolveOverlays(buildroot, 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"
@@ -567,6 +584,10 @@ def main():
                             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: