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

masters/master.client.dart/master.cfg

 # -*- python -*-
 # ex: set syntax=python:
 
 # Copyright (c) 2012 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.
 
 # It has one job: define a dictionary named BuildmasterConfig. This
 # dictionary has a variety of keys to control different aspects of the
 # buildmaster. They are documented in docs/config.xhtml .
@@ skipping 119 matching lines @@
       'platform': 'posix' + postfix,
       'env': linux_env,
     },
     {
       'name': 'linux-distribution-support-debian_wheezy' + postfix,
       'category': category('99misc'),
       'platform': 'posix' + postfix,
     },
   ]
 
-
-  # 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 = [
     {
       'name': 'target-arm-vm-linux-release' + postfix,
       'category': category('1vm-misc'),
       'factory_builder': annotator.BaseFactory(
           recipe='dart/dart_cross_tester'),
       'platform': 'posix' + postfix,
     },
     {
@@ skipping 344 matching lines @@
       'factory_builder': annotator.BaseFactory(recipe='dart/dart_vm'),
       'platform': 'posix' + postfix,
     })
     variants_vm_recipe.append({
       'name': ('vm-linux-%s-x64-reload-rollback' % mode) + postfix,
       'category': category('1vm-reload'),
       'factory_builder': annotator.BaseFactory(recipe='dart/dart_vm'),
       '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 = []
     variants_vm_recipe = []
     variants_recipe_special_trigger = []
 
   # Add the dartium recipe builders after clearing on the integration branch,
   # so they are also on that branch.
   variants_vm_recipe.append({
     'name': ('dartium-linux-ia32') + postfix,
@@ skipping 12 matching lines @@
     if channel.name == 'be' or channel.name == 'integration':
       variants_vm_recipe.append({
         'name': ('dartium-%s-%s-inc' % (platform, bitness)) + postfix,
         'category': category('6dartium-inc'),
         'factory_builder': annotator.BaseFactory(recipe='dart/dartium'),
         'platform': ('windows' if platform == 'win' else 'posix') + postfix,
       })
 
 
   ####### 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'] = []
 for channel in CHANNELS:
   setup_channel(channel)
 
 ####### CHANGESOURCES
 
 c['change_source'] = [
     utils.get_github_mirror_poller('dart-lang',
@@ skipping 107 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'] = ActiveMaster.buildbot_url