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

master.chromeos/master.cfg

Index: master.chromeos/master.cfg
===================================================================
--- master.chromeos/master.cfg	(revision 40778)
+++ master.chromeos/master.cfg	(working copy)
@@ -99,15 +99,16 @@
   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',
   ])
 
 
@@ -142,8 +143,8 @@
 # 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,
@@ -163,8 +164,8 @@
     }
 )
 
-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,
@@ -184,8 +185,8 @@
     }
 )
 
-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,
@@ -205,8 +206,8 @@
     }
 )
 
-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,
@@ -226,8 +227,8 @@
     }
 )
 
-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,
@@ -247,8 +248,8 @@
     }
 )
 
-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,
@@ -268,8 +269,29 @@
     }
 )
 
-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,
@@ -289,8 +311,8 @@
     }
 )
 
-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,
@@ -311,8 +333,8 @@
     }
 )
 
-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={
@@ -349,79 +371,87 @@
 #                       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,
 ]