Merge MVP script into cbuildbot.

buildbot/cbuildbot_config.py

 # 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.
 
 """Dictionary of configuration types for cbuildbot.
 
 Each dictionary entry is in turn a dictionary of config_param->value.
 
 config_param's:
 board -- The board of the image to build.
@@ skipping 27 matching lines @@
 
 usepkg -- Use binary packages to bootstrap, when possible. (emerge --usepkg)
 chroot_replace -- wipe and replace chroot, but not source.
 
 gs_path -- Google Storage path to offload files to
 build_type -- Upload prebuilts under the specified category. Can be any of
               [preflight|full|chrome].
 test_mod -- Create a test mod image for archival.
 factory_install_mod -- Create a factory install image for archival.
 factory_test_mod -- Create a factory test image for archival.
+
+git_url -- git repository URL for our manifests.
+         External: http://git.chromium.org/git/manifest

[sosa, 2011/04/11 19:03:54]

indentation?

[dgarrett, 2011/04/11 20:53:13]

Done.

+         Internal: ssh://git@gitrw.chromium.org:9222/manifest-internal
+
+manifest_version -- Per-build manifest to be stored in GIT repo at specified

[sosa, 2011/04/11 19:03:54]

Maybe re-word as:  URL to GIT repo to store per-build manifest.

[dgarrett, 2011/04/11 20:53:13]

Done.

+           URL. Usually None or

[sosa, 2011/04/11 19:03:54]

indentation?

[dgarrett, 2011/04/11 20:53:13]

Done.

+                        ssh://git@gitrw.chromium.org:9222/manifest-versions
 """
 
 # TODO(dgarrett) Make test_mod, factory_install_mod, factory_test_mod options
 # go away when these options work for arm.
 
 default = {
   # 'board' No default value
 
   'master' : False,
   'important' : False,
@@ skipping 13 matching lines @@
 
   'usepkg' : True,
   'chroot_replace' : False,
 
   'build_type' : False,
   'archive_build_debug' : False,
 
   'test_mod' : False,
   'factory_install_mod' : False,
   'factory_test_mod' : False,
+
+  'git_url' : 'http://git.chromium.org/git/manifest',
+  'manifest_version' : None,
 }
 
 arm = {
   # VM/tests are broken on arm.
   'unittests' : False,
   'vm_tests' : False,
 
   # These images don't work for arm.
   'factory_install_mod' : False,
   'factory_test_mod' : False,
@@ skipping 146 matching lines @@
 config['x86-generic-full'].update(full)
 config['x86-generic-full'].update({
   'board' : 'x86-generic',
 })
 
 config['x86-pineview-full'] = default.copy()
 config['x86-pineview-full'].update(full)
 config['x86-pineview-full'].update({
   'board' : 'x86-pineview',
 })
+
+config['x86-generic-manifest'] = default.copy()
+config['x86-generic-manifest'].update({
+  'board' : 'x86-generic',
+
+  'git_url' : 'ssh://git@gitrw.chromium.org:9222/manifest-internal',
+  'manifest_version' : 'ssh://git@gitrw.chromium.org:9222/manifest-versions',
+})
+
+