Temporarily turning off beagleboard until we can get it right....

master.chromeos/master.cfg

 # -*- python -*-
 # ex: set syntax=python:
 
 # Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This is the buildmaster config file for the 'chromeos' bot. It must
 # be installed as 'master.cfg' in your buildmaster's base directory
 # (although the filename can be changed with the --basedir option to
@@ skipping 81 matching lines @@
 # - slaves.cfg
 # - public_html/announce.html
 # - And down below in the builder definitions as well
 # - and you probably need to restart any changed slaves as well as the master
 s_chromeos = Scheduler(
   name='chromeos',
   # Renamed 'src' to 'master' for git_buildbot.py
   branch='master',
   treeStableTimer=0,
   builderNames=[
-     'arm new incremental image',
-     'arm new full image',
-     'arm st1q incremental image',
-     'arm st1q full image',
-     'arm beagleboard incremental image',
-     'arm beagleboard full image',
-     'arm tegra2 full image',
-     'x86 new incremental image (RC)',
-     'x86 new full image',
+     'arm generic incremental',
+     'arm generic full',
+     'arm st1q incremental',
+     'arm st1q full',
+#     'arm beagleboard incremental',
+#     'arm beagleboard full',
+     'arm tegra2 incremental',
+     'arm tegra2 full',
+     'x86 generic incremental (RC)',
+     'x86 generic full',
   ])
 
 
 # TODO: add ARM builds
 
 c['schedulers'] = [s_chromeos]
 
 ####### BUILDERS
 
 # buildbot/process/factory.py provides several BuildFactory classes you can
@@ skipping 14 matching lines @@
 m_x86 = chromeos_factory.ChromeOSFactory(
     'chromeos/src/scripts', 'linux', target_arch='x86')
 
 m_arm = chromeos_factory.ChromeOSFactory(
     'chromeos/src/scripts', 'linux', target_arch='arm')
 
 
 # The identifier of the factory is the build configuration. If two factories
 # are using the same build configuration, they should have the same identifier.
 
-f_arm_new_image_inc = m_arm.ChromeOSFactory(
-    'arm-new-image-inc',
+f_arm_generic_inc = m_arm.ChromeOSFactory(
+    'arm-generic-inc',
     steps=['make_chroot', 'platform', 'image'],
     options={
         'lasercats': True,
         'lasercats_board': 'arm-generic',
 #        'lasercats_jobs': '--jobs 5',
         'lasercats_extra': '--usepkg',
         'lasercats_testmod': '--notest_mod',
     },
     factory_properties={
         'archive_build': True,
         'archive_max': 50,
         # TODO: These builds need to be archived somewhere other than the slave
         # similar to the Chrome buildbot mechanism that uses chrome-web.
         # For now they will stay on the pubically inaccessible slave
         # for internally testing purposes.  External users will get a 403.
         'archive_url': 'http://codg175.jail.google.com/archive',
     }
 )
 
-f_arm_new_image_rel = m_arm.ChromeOSFactory(
-    'arm-new-image-rel',
+f_arm_generic_rel = m_arm.ChromeOSFactory(
+    'arm-generic-rel',
     steps=['make_chroot', 'platform', 'image', 'cache'],
     options={
         'lasercats': True,
         'lasercats_board': 'arm-generic',
         'lasercats_replace': '--replace',
         'lasercats_testmod': '--notest_mod',
 #        'lasercats_jobs': '--jobs 5',
     },
     factory_properties={
         'archive_build': True,
         'archive_max': 50,
         # TODO: These builds need to be archived somewhere other than the slave
         # similar to the Chrome buildbot mechanism that uses chrome-web.
         # For now they will stay on the pubically inaccessible slave
         # for internally testing purposes.  External users will get a 403.
         'archive_url': 'http://codg176.jail.google.com/archive',
     }
 )
 
-f_arm_st1q_image_inc = m_arm.ChromeOSFactory(
-    'arm-st1q-image-inc',
+f_arm_st1q_inc = m_arm.ChromeOSFactory(
+    'arm-st1q-inc',
     steps=['make_chroot', 'platform', 'image'],
     options={
         'lasercats': True,
         'lasercats_board': 'st1q',
 #        'lasercats_jobs': '--jobs 5',
         'lasercats_extra': '--usepkg',
         'lasercats_testmod': '--notest_mod',
     },
     factory_properties={
         'archive_build': True,
         'archive_max': 50,
         # TODO: These builds need to be archived somewhere other than the slave
         # similar to the Chrome buildbot mechanism that uses chrome-web.
         # For now they will stay on the pubically inaccessible slave
         # for internally testing purposes.  External users will get a 403.
         'archive_url': 'http://codg158.jail.google.com/archive',
     }
 )
 
-f_arm_st1q_image_rel = m_arm.ChromeOSFactory(
-    'arm-st1q-image-rel',
+f_arm_st1q_rel = m_arm.ChromeOSFactory(
+    'arm-st1q-rel',
     steps=['make_chroot', 'platform', 'image', 'cache'],
     options={
         'lasercats': True,
         'lasercats_board': 'st1q',
         'lasercats_replace': '--replace',
         'lasercats_testmod': '--notest_mod',
 #        'lasercats_jobs': '--jobs 5',
     },
     factory_properties={
         'archive_build': True,
         'archive_max': 50,
         # TODO: These builds need to be archived somewhere other than the slave
         # similar to the Chrome buildbot mechanism that uses chrome-web.
         # For now they will stay on the pubically inaccessible slave
         # for internally testing purposes.  External users will get a 403.
         'archive_url': 'http://codg159.jail.google.com/archive',
     }
 )
 
-f_arm_beagleboard_image_inc = m_arm.ChromeOSFactory(
-    'arm-beagleboard-image-inc',
+f_arm_beagleboard_inc = m_arm.ChromeOSFactory(
+    'arm-beagleboard-inc',
     steps=['make_chroot', 'platform', 'image'],
     options={
         'lasercats': True,
         'lasercats_board': 'beagleboard',
 #        'lasercats_jobs': '--jobs 5',
         'lasercats_extra': '--usepkg',
         'lasercats_testmod': '--notest_mod',
     },
     factory_properties={
         'archive_build': True,
         'archive_max': 50,
         # TODO: These builds need to be archived somewhere other than the slave
         # similar to the Chrome buildbot mechanism that uses chrome-web.
         # For now they will stay on the pubically inaccessible slave
         # for internally testing purposes.  External users will get a 403.
         'archive_url': 'http://codg172.jail.google.com/archive',
     }
 )
 
-f_arm_beagleboard_image_rel = m_arm.ChromeOSFactory(
-    'arm-beagleboard-image-rel',
+f_arm_beagleboard_rel = m_arm.ChromeOSFactory(
+    'arm-beagleboard-rel',
     steps=['make_chroot', 'platform', 'image', 'cache'],
     options={
         'lasercats': True,
         'lasercats_board': 'beagleboard',
         'lasercats_replace': '--replace',
         'lasercats_testmod': '--notest_mod',
 #        'lasercats_jobs': '--jobs 5',
     },
     factory_properties={
         'archive_build': True,
         'archive_max': 50,
         # TODO: These builds need to be archived somewhere other than the slave
         # similar to the Chrome buildbot mechanism that uses chrome-web.
         # For now they will stay on the pubically inaccessible slave
         # for internally testing purposes.  External users will get a 403.
         'archive_url': 'http://codg173.jail.google.com/archive',
     }
 )
 
-f_arm_tegra2_image_rel = m_arm.ChromeOSFactory(
-    'arm-tegra2-image-rel',
+f_arm_tegra2_inc = m_arm.ChromeOSFactory(
+    'arm-tegra2-inc',
+    steps=['make_chroot', 'platform', 'image'],
+    options={
+        'lasercats': True,
+        'lasercats_board': 'tegra2-dev-board',
+#        'lasercats_jobs': '--jobs 5',
+        'lasercats_extra': '--usepkg',
+        'lasercats_testmod': '--notest_mod',
+    },
+    factory_properties={
+        'archive_build': True,
+        'archive_max': 50,
+        # TODO: These builds need to be archived somewhere other than the slave
+        # similar to the Chrome buildbot mechanism that uses chrome-web.
+        # For now they will stay on the pubically inaccessible slave
+        # for internally testing purposes.  External users will get a 403.
+        'archive_url': 'http://codg172.jail.google.com/archive',
+    }
+)
+
+f_arm_tegra2_rel = m_arm.ChromeOSFactory(
+    'arm-tegra2-rel',
     steps=['make_chroot', 'platform', 'image', 'cache'],
     options={
         'lasercats': True,
         'lasercats_board': 'tegra2-dev-board',
         'lasercats_replace': '--replace',
         'lasercats_testmod': '--notest_mod',
 #        'lasercats_jobs': '--jobs 5',
     },
     factory_properties={
         'archive_build': True,
         'archive_max': 50,
         # TODO: These builds need to be archived somewhere other than the slave
         # similar to the Chrome buildbot mechanism that uses chrome-web.
         # For now they will stay on the pubically inaccessible slave
         # for internally testing purposes.  External users will get a 403.
         'archive_url': 'http://codg136.jail.google.com/archive',
     }
 )
 
-f_x86_new_image_inc = m_x86.ChromeOSFactory(
-    'x86-new-image-inc',
+f_x86_generic_inc = m_x86.ChromeOSFactory(
+    'x86-generic-inc',
     steps=['make_chroot', 'platform', 'image'],
     options={
         'lasercats': True,
         'lasercats_board': 'x86-generic',
 #        'lasercats_jobs': '--jobs 5',
         'lasercats_extra': '--usepkg',
         'lasercats_chromebase': '--chromebase http://codf196.jail.google.com/archive/chrome-official',
         'lasercats_testmod': '--notest_mod',
     },
     factory_properties={
         'archive_build': True,
         'archive_max': 50,
         # TODO: These builds need to be archived somewhere other than the slave
         # similar to the Chrome buildbot mechanism that uses chrome-web.
         # For now they will stay on the pubically inaccessible slave
         # for internally testing purposes.  External users will get a 403.
         'archive_url': 'http://codg174.jail.google.com/archive',
     }
 )
 
-f_x86_new_image_rel = m_x86.ChromeOSFactory(
-    'x86-new-image-rel',
+f_x86_generic_rel = m_x86.ChromeOSFactory(
+    'x86-generic-rel',
     steps=['make_chroot', 'platform', 'image', 'cache'],
     tests=['platform'],
     options={
         'lasercats': True,
         'lasercats_board': 'x86-generic',
         'lasercats_replace': '--replace',
         'lasercats_autotest': '--withautotest',
         'lasercats_testmod': '--test_mod',
 #        'lasercats_jobs': '--jobs 5',
     },
@@ skipping 16 matching lines @@
 #  name (required): the name used to describe this bilder
 #  slavename (required): which slave to use, must appear in c['slaves']
 #  builddir (required): which subdirectory to run the builder in
 #  factory (required): a BuildFactory to define how the build is run
 #  periodicBuildTime (optional): if set, force a build every N seconds
 #  category (optional): it is not used in the normal 'buildbot' meaning. It is
 #                       used by gatekeeper to determine which steps it should
 #                       look for to close the tree.
 #
 
-b_arm_new_image_inc = {
-    'name': 'arm new incremental image',
-    'builddir': 'arm-new-image-inc',
-    'factory': f_arm_new_image_inc,
+b_arm_generic_inc = {
+    'name': 'arm generic incremental',
+    'builddir': 'arm-generic-inc',
+    'factory': f_arm_generic_inc,
     'category': '1release full|builders_compile',
 }
 
-b_arm_new_image_rel = {
-    'name': 'arm new full image',
-    'builddir': 'arm-new-image-rel',
-    'factory': f_arm_new_image_rel,
+b_arm_generic_rel = {
+    'name': 'arm generic full',
+    'builddir': 'arm-generic-rel',
+    'factory': f_arm_generic_rel,
     'category': '1release full|builders_compile',
 }
 
-b_arm_st1q_image_inc = {
-    'name': 'arm st1q incremental image',
-    'builddir': 'arm-st1q-image-inc',
-    'factory': f_arm_st1q_image_inc,
+b_arm_st1q_inc = {
+    'name': 'arm st1q incremental',
+    'builddir': 'arm-st1q-inc',
+    'factory': f_arm_st1q_inc,
     'category': '1release full|builders_compile',
 }
 
-b_arm_st1q_image_rel = {
-    'name': 'arm st1q full image',
-    'builddir': 'arm-st1q-image-rel',
-    'factory': f_arm_st1q_image_rel,
+b_arm_st1q_rel = {
+    'name': 'arm st1q full',
+    'builddir': 'arm-st1q-rel',
+    'factory': f_arm_st1q_rel,
     'category': '1release full|builders_compile',
 }
 
-b_arm_beagleboard_image_inc = {
-    'name': 'arm beagleboard incremental image',
-    'builddir': 'arm-beagleboard-image-inc',
-    'factory': f_arm_beagleboard_image_inc,
+b_arm_beagleboard_inc = {
+    'name': 'arm beagleboard incremental',
+    'builddir': 'arm-beagleboard-inc',
+    'factory': f_arm_beagleboard_inc,
     'category': '1release full|builders_compile',
 }
 
-b_arm_beagleboard_image_rel = {
-    'name': 'arm beagleboard full image',
-    'builddir': 'arm-beagleboard-image-rel',
-    'factory': f_arm_beagleboard_image_rel,
+b_arm_beagleboard_rel = {
+    'name': 'arm beagleboard full',
+    'builddir': 'arm-beagleboard-rel',
+    'factory': f_arm_beagleboard_rel,
     'category': '1release full|builders_compile',
 }
 
-b_arm_tegra2_image_rel = {
-    'name': 'arm tegra2 full image',
-    'builddir': 'arm-tegra2-image-rel',
-    'factory': f_arm_tegra2_image_rel,
+b_arm_tegra2_inc = {
+    'name': 'arm tegra2 incremental',
+    'builddir': 'arm-tegra2-inc',
+    'factory': f_arm_tegra2_inc,
     'category': '1release full|builders_compile',
 }
 
-b_x86_new_image_inc = {
-    'name': 'x86 new incremental image (RC)',
-    'builddir': 'x86-new-image-inc',
-    'factory': f_x86_new_image_inc,
+b_arm_tegra2_rel = {
+    'name': 'arm tegra2 full',
+    'builddir': 'arm-tegra2-rel',
+    'factory': f_arm_tegra2_rel,
     'category': '1release full|builders_compile',
 }
 
-b_x86_new_image_rel = {
-    'name': 'x86 new full image',
-    'builddir': 'x86-new-image-rel',
-    'factory': f_x86_new_image_rel,
+b_x86_generic_inc = {
+    'name': 'x86 generic incremental (RC)',
+    'builddir': 'x86-generic-inc',
+    'factory': f_x86_generic_inc,
+    'category': '1release full|builders_compile',
+}
+
+b_x86_generic_rel = {
+    'name': 'x86 generic full',
+    'builddir': 'x86-generic-rel',
+    'factory': f_x86_generic_rel,
     'category': '1release full|builders_compile',
 }
 
 c['builders'] = [
-  b_arm_new_image_inc,
-  b_arm_new_image_rel,
-  b_arm_st1q_image_inc,
-  b_arm_st1q_image_rel,
-  b_arm_beagleboard_image_inc,
-  b_arm_beagleboard_image_rel,
-  b_arm_tegra2_image_rel,
-  b_x86_new_image_inc,
-  b_x86_new_image_rel,
+  b_arm_generic_inc,
+  b_arm_generic_rel,
+  b_arm_st1q_inc,
+  b_arm_st1q_rel,
+#  b_arm_beagleboard_inc,
+#  b_arm_beagleboard_rel,
+  b_arm_tegra2_inc,
+  b_arm_tegra2_rel,
+  b_x86_generic_inc,
+  b_x86_generic_rel,
 ]
 
 
 ####### BUILDSLAVES
 
 # the 'slaves' list defines the set of allowable buildslaves. Each element is a
 # tuple of bot-name and bot-password. These correspond to values given to the
 # buildslave's mktap invocation.
 
 # First, load the list from slaves.cfg.
@@ skipping 113 matching lines @@
 c['projectName'] = ActiveMaster.project_name
 c['projectURL'] = config.Master.project_url
 
 # the 'buildbotURL' string should point to the location where the buildbot's
 # internal web server (usually the html.Waterfall page) is visible. This
 # typically uses the port number set in the Waterfall 'status' entry, but
 # with an externally-visible host name which the buildbot cannot figure out
 # without some help.
 
 c['buildbotURL'] = 'http://build.chromium.org/buildbot/chromiumos/'