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..41fe3e3044e642c3e80777634e1fcf1c5e58f226 100644
--- a/bin/cbuildbot_config.py
+++ b/bin/cbuildbot_config.py
@@ -8,119 +8,141 @@ 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
              then the master will uprev packages.  This should align
-             with info vs. closer except for the master.
+             with info vs. closer except for the master.and options.tests
 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)
+                 
+unittests -- Runs unittests for packages.
+vm_tests -- Runs the smoke suite and au test harness in a qemu-based VM
+            using KVM.
+
+usepkg -- Use binary packages to bootstrap, when possible. (emerge --usepkg)
+chroot_replace -- wipe and replace chroot, but not source.
+
+archive_build -- Do we run archive_build.sh
+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.
 """
 
+# 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
 
-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,
+
+  'unittests' : True,
+  'vm_tests' : True,
+
+  'usepkg' : True,
+  'chroot_replace' : False,
+  
+  'archive_build' : 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'] = {
+})
+
+config['x86-mario-pre-flight-queue'] = default.copy()
+config['x86-mario-pre-flight-queue'].update({
   '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'] = {
+})
+
+config['x86-mario-pre-flight-branch'] = default.copy()
+config['x86-mario-pre-flight-branch'].update({
   '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'].update({
   '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'].update({
   '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'].update({
   'board' : 'x86-pineview',
   'uprev' : True,
-  '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'].update({
   'board' : 'tegra2_dev-board',
   'uprev' : True,
-  'master' : False,
-  'important' : False,
   'unittests' : False,
+  'vm_tests' : 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'].update({
   'board' : 'arm-generic',
   'uprev' : True,
-  'master' : False,
-  'important' : False,
   'unittests' : False,
-  'rev_overlays': 'public',
-  'push_overlays': None,
+  'vm_tests' : False,
   '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']