Revert "Have the ability for the PFQ to both rev Chrome and ..."

bin/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.
 
 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.and options.tests
 hostname -- Needed for 'important' slaves.  The hostname of the bot.  Should
             match hostname in slaves.cfg in buildbot checkout.
 
 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.
-
+                 
 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.
@@ skipping 12 matching lines @@
 
   '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 = {}
 
 config['x86-generic-pre-flight-queue'] = default.copy()
 config['x86-generic-pre-flight-queue'].update({
   'board' : 'x86-generic',
   'uprev' : True,
   'master' : True,
   'hostname' : 'chromeosbuild2',
   'rev_overlays': 'public',
   'push_overlays': 'public',
 })
-config['x86-generic-chrome-pre-flight-queue'] = default.copy()
-config['x86-generic-chrome-pre-flight-queue'].update({
-  'board' : 'x86-generic',
-  'uprev' : False,
-  'master' : True,
-  'rev_overlays': 'public',
-  'push_overlays': 'public',
-})
+
+config['x86-generic-chrome-pre-flight-queue'] = \
+    config['x86-generic-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,
   'rev_overlays': 'both',
   'push_overlays': 'private',
 })
+
 config['x86-mario-pre-flight-branch'] = default.copy()
 config['x86-mario-pre-flight-branch'].update({
   'board' : 'x86-mario',
   'uprev' : True,
   'master' : True,
   'rev_overlays': 'both',
   'push_overlays': 'both',
 })
 
 config['x86-agz-bin'] = default.copy()
@@ skipping 37 matching lines @@
   'uprev' : True,
   'unittests' : False,
   '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']
+config['x86_pineview_bin'] = config['x86-pineview-bin'] 
+config['arm_tegra2_bin'] = config['arm-tegra2-bin'] 
+config['arm_generic_bin'] = config['arm-generic-bin']