Add more cbuild options, revise configs

bin/cbuildbot_config.py

Index: bin/cbuildbot_config.py
diff --git a/bin/cbuildbot_config.py b/bin/cbuildbot_config.py
index 3389c11295f1fc7eedeaf4266d072f6205026108..b1b616bebfda265236e45eea5fb1859497e89914 100644
--- a/bin/cbuildbot_config.py
+++ b/bin/cbuildbot_config.py
@@ -8,8 +8,7 @@ Each dictionary entry is in turn a dictionary of config_param->value.
 
 config_param's:
 board -- The board of the image to build.
-uprev -- Uprevs the local ebuilds to build new changes since last stable.
-         build.  If master then also pushes these changes on success.
+
 master -- This bot pushes changes to the overlays.
 important -- Master bot uses important bots to determine overall status.
              i.e. if master bot succeeds and other important slaves succeed
@@ -17,110 +16,132 @@ important -- Master bot uses important bots to determine overall status.
              with info vs. closer except for the master.
 hostname -- Needed for 'important' slaves.  The hostname of the bot.  Should
             match hostname in slaves.cfg in buildbot checkout.
-unittests -- Runs unittests for packages.
-tests -- Runs the smoke suite and au test harness in a qemu-based VM using KVM.
+
+uprev -- Uprevs the local ebuilds to build new changes since last stable.
+         build.  If master then also pushes these changes on success.
 rev_overlays -- Select what overlays to look at for revving. This can be
                 'public', 'private' or 'both'.
 push_overlays -- Select what overlays to push at. This should be a subset of
                  rev_overlays for the particular builder.  Must be None if
                  not a master.  There should only be one master bot pushing
                  changes to each overlay per branch.
-test_mod -- Create a test mod image. (default True)
-factory_install_mod -- Create a factory install image. (default True)
-factory_test_mod -- Create a factory test image. (default True)
+                 
+archive_build -- Do we run archive_build.sh
+
+autotests -- Run autotests in build_package

[sosa, 2011/01/27 00:50:55]

Build autotests in build_package (not run)

[dgarrett, 2011/01/27 01:35:02]

Um... how do they get run in cbuild? Perhaps the same flag should control both
building and running them.

[dgarrett, 2011/01/27 01:43:20]

Is it fair to say that autotests should be true if "tests" or "unittests" is
true (and no --notests)?

+unittests -- Runs unittests for packages.
+tests -- Runs the smoke suite and au test harness in a qemu-based VM using KVM.
+
+usepkg -- Use binary packages to bootstrap, when possible
+chroot_replace -- wipe and replace chroot, but not source
+
+test_mod -- Create a test mod image.

[sosa, 2011/01/27 00:50:55]

Why are these currently set at all?  Don't these only affect full builders (not
bin's)

[dgarrett, 2011/01/27 01:35:02]

Ah, I made a mistake. The only affect builds that are archived. They are enabled
for everything but arm right now, and I'd like to make these options go away
when they work properly for arm.

I'll rearrange and fix docs to make this clear.

+factory_install_mod -- Create a factory install image.
+factory_test_mod -- Create a factory test image.
 """
 
+default = {
+  # 'board' No default value

[sosa, 2011/01/27 00:50:55]

Why not purposefully set to None instead of comment.

[dgarrett, 2011/01/27 01:35:02]

For hostname, I know of a case where not setting it will lead to a python error,
where a None will get passed along in a confusing way.

Better checking for valid config's is the best answer, but I really didn't want
to go there yet.

 
-config = {}
-config['default'] = {
-  'board' : 'x86-generic',
-  'uprev' : False,
   'master' : False,
   'important' : False,
-  'unittests' : False,
-  'tests' : False,
+  # 'hostname' No default value
+
+  'uprev' : False,
   'rev_overlays': 'public',
   'push_overlays': None,
+  
+  'archive_build' : False,
+  
+  'autotests' : True,
+  'unittests' : True,
+  'tests' : True,
+
+  'usepkg' : True,
+  'chroot_replace' : False,
+  
+  'test_mod' : True,
+  'factory_install_mod' : True,
+  'factory_test_mod' : True,
 }
-config['x86-generic-pre-flight-queue'] = {
+
+config = {}
+
+config['x86-generic-pre-flight-queue'] = default.copy()
+config['x86-generic-pre-flight-queue'].update({
   'board' : 'x86-generic',
   'uprev' : True,
   'master' : True,
-  'important' : False,
   'hostname' : 'chromeosbuild2',
-  'unittests' : True,
-  'tests' : True,
   'rev_overlays': 'public',
   'push_overlays': 'public',
-}
+})
+
+config['x86-mario-pre-flight-queue'] = default.copy()
 config['x86-mario-pre-flight-queue'] = {
   'board' : 'x86-mario',
   'uprev' : True,
   'master' : True,
-  'important' : False,
-  'unittests' : True,
-  'tests' : True,
   'rev_overlays': 'both',
   'push_overlays': 'private',
 }
+
+config['x86-mario-pre-flight-branch'] = default.copy()
 config['x86-mario-pre-flight-branch'] = {
   'board' : 'x86-mario',
   'uprev' : True,
   'master' : True,
-  'important' : False,
-  'unittests' : True,
-  'tests' : True,
   'rev_overlays': 'both',
   'push_overlays': 'both',
 }
-config['x86_agz_bin'] = {
+
+config['x86-agz-bin'] = default.copy()
+config['x86-agz-bin'] = {
   'board' : 'x86-agz',
   'uprev' : True,
-  'master' : False,
-  'important' : False,
-  'unittests' : True,
-  'tests' : True,
   'rev_overlays': 'both',
   'push_overlays': None,
 }
-config['x86_dogfood_bin'] = {
+
+config['x86-dogfood-bin'] = default.copy()
+config['x86-dogfood-bin'] = {
   'board' : 'x86-dogfood',
   'uprev' : True,
-  'master' : False,
-  'important' : False,
-  'unittests' : True,
-  'tests' : True,
   'rev_overlays': 'both',
   'push_overlays': None,
 }
-config['x86_pineview_bin'] = {
+
+config['x86-pineview-bin'] = default.copy()
+config['x86-pineview-bin'] = {
   'board' : 'x86-pineview',
   'uprev' : True,

[sosa, 2011/01/27 00:50:55]

Does not run autotests currently (doesn't work) though it might work ...

-  'master' : False,
-  'important' : False,
-  'unittests': True,
   'rev_overlays': 'public',
   'push_overlays': None,
 }
-config['arm_tegra2_bin'] = {
+
+config['arm-tegra2-bin'] = default.copy()
+config['arm-tegra2-bin'] = {
   'board' : 'tegra2_dev-board',
   'uprev' : True,

[sosa, 2011/01/27 00:50:55]

autotest  settings are wrong

-  'master' : False,
-  'important' : False,
   'unittests' : False,
   'rev_overlays': 'public',
   'push_overlays': None,
   'factory_install_mod' : False,
   'factory_test_mod' : False,
 }
-config['arm_generic_bin'] = {
+
+config['arm-generic-bin'] = default.copy()
+config['arm-generic-bin'] = {
   'board' : 'arm-generic',

[sosa, 2011/01/27 00:50:55]

autotest settings are wrong

   'uprev' : True,
-  'master' : False,
-  'important' : False,
   'unittests' : False,
-  'rev_overlays': 'public',
-  'push_overlays': None,
   'factory_install_mod' : False,
   'factory_test_mod' : False,
 }
+
+# TODO(dgarrett) delete when buildbot updated to use new names
+config['x86_agz_bin'] = config['x86-agz-bin']
+config['x86_dogfood_bin'] = config['x86-dogfood-bin']
+config['x86_pineview_bin'] = config['x86-pineview-bin'] 
+config['arm_tegra2_bin'] = config['arm-tegra2-bin'] 
+config['arm_generic_bin'] = config['arm-generic-bin']