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

masters/master.client.dart.fyi/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 170 matching lines @@
     },
     {
       'name': 'v8-mac-release',
       'factory_builder': annotator.BaseFactory('v8'),
       'category': category('3v8'),
       'platform': 'v8_vm',
       'arch': 'ia32',
     },
   ]
 
-  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(
         recipe='dart/dart2js_nobuild'),
     'platform': 'windows' + postfix,
     'env': windows_env
   })
 
   variants_dart_recipe.append({
     'name': 'dart2js-linux-chromeff' + postfix,
@@ skipping 32 matching lines @@
 
   variants_dart_recipe.append({
     'name': 'dart2js-mac10.11-safarimobilesim' + postfix,
     'builddir': 'mobile' + postfix,
     'category': category('90safari'),
     'factory_builder': annotator.BaseFactory(
         recipe='dart/dart2js'),
     'platform': 'posix' + postfix,
   })
 
-  ####### Dartium integration overrides, we only use the dartium builders there
   if channel.name == 'integration':
     variants = []
     variants_dart_recipe = []
 
   ####### 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)
 
 c['builders'] = []
 c['schedulers'] = []
 for channel in CHANNELS:
-  setup_channel(channel)
+  if channel_name != 'integration':
+    setup_channel(channel)
 
 ####### CHANGESOURCES
 
 c['change_source'] = [
     utils.get_github_mirror_poller('dart-lang',
                                    'sdk',
                                    branch='master',
                                    master='fyi'),
     utils.get_github_mirror_poller('dart-lang',
                                    'sdk',
@@ skipping 72 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