Remove old dartium_factory builders, clean up slaves.cfg files.

masters/master.client.dart/master.cfg

Index: masters/master.client.dart/master.cfg
diff --git a/masters/master.client.dart/master.cfg b/masters/master.client.dart/master.cfg
index d7171453db6f021833b8b7b4d9a6030e68d8f000..a77447a7d3130a4996b91379927e6e539bad01c4 100644
--- a/masters/master.client.dart/master.cfg
+++ b/masters/master.client.dart/master.cfg
@@ -137,16 +137,6 @@ def setup_channel(channel):
     },
   ]
 
-
-  # Only run ie 9 tests on stable channel
-  if channel.name == 'stable':
-    variants.append({
-      'name': 'dart2js-ie9-win7-all' + postfix,
-      'category': category('92dart2js-windows'),
-      'platform': 'windows' + postfix,
-      'env': windows_env,
-    })
-
   # Add recipe-based dart builders and testers
   variants_recipe_special_trigger = [
     {
@@ -511,52 +501,6 @@ def setup_channel(channel):
       'platform': 'posix' + postfix,
     })
 
-  variants_dartium = []
-
-  ####### Don't run dartium-inc on dev/stable
-  if channel.name == 'be' or channel.name == 'integration':
-    variants_dartium.extend([
-      {
-        'name' : 'dartium-mac-inc' + postfix,
-        'category' : category('6dartium-inc'),
-      },
-      {
-        'name' : 'dartium-lucid64-inc' + postfix,
-        'category' : category('6dartium-inc'),
-      },
-      {
-        'name': 'dartium-win-inc-ninja' + postfix,
-        'category' : category('6dartium-inc'),
-        'builddir': 'w-' + postfix,
-      },
-    ])
-
-  variants_dartium_full_mac = [
-    {
-      'name' : 'dartium-mac-full' + postfix,
-      'category' : category('97dartium-full'),
-    },
-  ]
-
-  variants_dartium_full_linux = [
-    {
-      'name' : 'dartium-lucid64-full' + postfix,
-      'category' : category('97dartium-full'),
-    },
-    {
-      'name' : 'dartium-lucid32-full' + postfix,
-      'category' : category('97dartium-full'),
-    },
-  ]
-
-  variants_dartium_full_win = [
-    {
-      'name' : 'dartium-win-full' + postfix,
-      'category' : category('97dartium-full'),
-    },
-  ]
-
-
   ####### Dartium integration overrides, we only use the dartium builders there
   if channel.name == 'integration':
     variants = []
@@ -589,82 +533,27 @@ def setup_channel(channel):
 
 
   ####### Factory setup
-
   utils.setup_factories(variants)
-  utils.setup_dartium_factories(variants_dartium)
-  utils.setup_dartium_factories(variants_dartium_full_mac)
-  utils.setup_dartium_factories(variants_dartium_full_linux)
-  utils.setup_dartium_factories(variants_dartium_full_win)
 
   ####### Schedulers
 
   # builder names
   builder_names = utils.get_builder_names(variants)
   vm_recipe_builder_names = utils.get_builder_names(variants_vm_recipe)
-  dartium_builder_names = utils.get_builder_names(variants_dartium)
-  dartium_full_linux_builder_names = (
-      utils.get_builder_names(variants_dartium_full_linux))
-  dartium_full_mac_builder_names = (
-      utils.get_builder_names(variants_dartium_full_mac))
-  dartium_full_win_builder_names = (
-      utils.get_builder_names(variants_dartium_full_win))
-
-  if channel.name in ['be', 'integration']:
-    # normal builders + dartium builders
-    c['schedulers'].append(Scheduler(
-        name='main' + postfix,
-        branch=channel.branch,
-        treeStableTimer=0,
-        builderNames=builder_names +
-                     dartium_builder_names +
-                     vm_recipe_builder_names +
-                     dartium_full_linux_builder_names +
-                     dartium_full_mac_builder_names +
-                     dartium_full_win_builder_names
-    ))
-  else:
-    c['schedulers'].append(Scheduler(
-        name='main' + postfix,
-        branch=channel.branch,
-        treeStableTimer=0,
-        builderNames=builder_names + dartium_builder_names +
-                     vm_recipe_builder_names))
-
-    s_dartium_linux = Scheduler(
-        name='dartium-linux' + postfix,
-        branch=channel.branch,
-        treeStableTimer=0,
-        builderNames=dartium_full_linux_builder_names)
-    s_dartium_mac = Scheduler(
-        name='dartium-mac' + postfix,
-        branch=channel.branch,
-        treeStableTimer=0,
-        builderNames=dartium_full_mac_builder_names)
-    s_dartium_win = Scheduler(
-        name='dartium-win' + postfix,
-        branch=channel.branch,
-        treeStableTimer=0,
-        builderNames=dartium_full_win_builder_names)
-    c['schedulers'].append(s_dartium_linux)
-    c['schedulers'].append(s_dartium_mac)
-    c['schedulers'].append(s_dartium_win)
 
+  c['schedulers'].append(Scheduler(
+      name='main' + postfix,
+      branch=channel.branch,
+      treeStableTimer=0,
+      builderNames=builder_names + vm_recipe_builder_names))
 
   ####### Builders
 
-  # Add non-dartium builders
   for collection in [variants, variants_vm_recipe,
                      variants_recipe_special_trigger]:
     for b in utils.get_builders_from_variants(collection, slaves, []):
       c['builders'].append(b)
-
-  # Add dartium builders
-  for collection in [variants_dartium, variants_dartium_full_linux,
-                     variants_dartium_full_mac, variants_dartium_full_win]:
-    # Reboot VMs after every build
-    for b in utils.get_builders_from_variants(collection, slaves, [],
-                                              ActiveMaster.is_production_host):
-      c['builders'].append(b)
+# End of setup_channel(channel)
 
 c['builders'] = []
 c['schedulers'] = []