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

masters/master.client.dart.fyi/master.cfg

Index: masters/master.client.dart.fyi/master.cfg
diff --git a/masters/master.client.dart.fyi/master.cfg b/masters/master.client.dart.fyi/master.cfg
index abebf6b685618939849a03abe16f13fcb5824f68..0e686a35b4da1c67840a73fd30a84ce149789c13 100644
--- a/masters/master.client.dart.fyi/master.cfg
+++ b/masters/master.client.dart.fyi/master.cfg
@@ -188,34 +188,10 @@ def setup_channel(channel):
     },
   ]
 
-  variants_dartium = [
-    {
-      'name' : 'dartium-mac-debug' + postfix,
-      'category' : category('96dartium-debug'),
-    },
-    {
-      'name' : 'dartium-lucid64-debug' + postfix,
-      'category' : category('96dartium-debug'),
-    },
-    {
-      'name' : 'dartium-win-debug' + postfix,
-      'category' : category('96dartium-debug'),
-    },
-  ]
-
   # Build and test Dart using recipes, rather than with annotated steps
   variants_dart_recipe = []
 
   variants_dart_recipe.append({
-    'name': 'dart-recipe' + postfix,
-    'category': category('1vm'),
-    'factory_builder': annotator.BaseFactory(
-        recipe='dart/dart'),
-    'platform': 'posix' + postfix,
-    'env': linux_env
-  })
-
-  variants_dart_recipe.append({
     'name': 'dart2js-win7-ie10chrome' + postfix,
     'category': category('2dart2js'),
     'factory_builder': annotator.BaseFactory(
@@ -268,7 +244,6 @@ def setup_channel(channel):
     'platform': 'posix' + postfix,
   })
 
-  ####### Dartium integration overrides, we only use the dartium builders there
   if channel.name == 'integration':
     variants = []
     variants_dart_recipe = []
@@ -276,41 +251,29 @@ def setup_channel(channel):
   ####### Factory setup
 
   utils.setup_factories(variants)
-  utils.setup_dartium_factories(variants_dartium)
 
   ####### Schedulers
 
   builder_names = utils.get_builder_names(variants)
 
-  dartium_builder_names = utils.get_builder_names(variants_dartium)
   dart_recipe_builder_names = (utils.get_builder_names(variants_dart_recipe))
 
-  # normal builders + editor builders + dartium builders
+  # normal builders + editor builders

[kustermann, 2016/09/08 16:44:44]

We don't have "editor_builders" anymore

[Bill Hesse, 2016/09/08 17:25:23]

Done.

   c['schedulers'].append(Scheduler(
     name='fyi-main' + postfix,
     branch=channel.branch,
     treeStableTimer=0,
-    builderNames=(builder_names + dartium_builder_names +
-                  dart_recipe_builder_names),
+    builderNames=(builder_names + dart_recipe_builder_names),
   ))
 
   ####### Builders
 
-  # Add non-dartium builders
   for collection in [variants, variants_dart_recipe]:
     for b in utils.get_builders_from_variants(collection, slaves, []):
       c['builders'].append(b)
 
-  # Add dartium builders
-  for collection in [variants_dartium]:
-    # Reboot VMs after every build
-    for b in utils.get_builders_from_variants(collection, slaves, [],
-                                              ActiveMaster.is_production_host):
-      c['builders'].append(b)
-
   # v8
   if channel.name == 'be':
-    # Add non-dartium builders
     for collection in [variants_v8]:
       for b in utils.get_builders_from_variants(collection, slaves, []):
         c['builders'].append(b)
@@ -318,7 +281,8 @@ def setup_channel(channel):
 c['builders'] = []
 c['schedulers'] = []
 for channel in CHANNELS:
-  setup_channel(channel)
+  if channel_name != 'integration':
+    setup_channel(channel)
 
 ####### CHANGESOURCES