Promote deterministic build CI to real CI (tree closer, except for the Clang builder)

masters/master.chromium.swarm/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.
 
 from buildbot.scheduler import Scheduler
 from buildbot.schedulers import timed
 from buildbot.status import mail
@@ skipping 52 matching lines @@
 c['schedulers'] = [s_chromium_swarm, s_heartbeat]
 
 
 # ----------------------------------------------------------------------------
 # BUILDER DEFINITIONS
 
 def RecipeBasedFactory(config):
   return annotator_factory.AnnotatorFactory().BaseFactory(
       'swarming/canary', factory_properties={'configuration': config})
 
-def DeterministicBuilderFactory(platform):
-  return  {
-      'name': '%s deterministic build' % platform,
-      # Work around an issue with NaCl build.
-      'slavebuilddir': 'chr',
-      'factory': annotator_factory.AnnotatorFactory().BaseFactory(
-          'swarming/deterministic_build',
-          factory_properties = {
-            'configuration': 'Release',
-          }),
-      # Auto-reboot:
-      # - On windows to try to clear up TEMP fill up issues.
-      # - On OSX due to fork: Resource temporarily unavailable
-      'auto_reboot': True,
-      'category': 'deterministic',
-    }
-
 b_heartbeat = {
   'name': 'Heartbeat',
   'builddir': 'heartbeat',
   'factory': annotator_factory.AnnotatorFactory().BaseFactory(
       'swarming/heartbeat'),
   'auto_reboot': False,
   'category': 'swarming',
 }
 
 b_heartbeat_canary = {
@@ skipping 48 matching lines @@
 }
 
 b_chromium_mac_swarm_dbg = {
   'name': 'Mac Swarm Tests (dbg)',
   'builddir': 'chromium-mac-swarm-dbg',
   'factory': RecipeBasedFactory('Debug'),
   'auto_reboot': False,
   'category': 'swarming',
 }
 
-b_win_deterministic_build = DeterministicBuilderFactory('Windows')
-b_win_clang_deterministic_build = DeterministicBuilderFactory('Windows Clang')
-b_linux_deterministic_build = DeterministicBuilderFactory('Linux')
-b_mac_deterministic_build = DeterministicBuilderFactory('Mac')
-b_android_deterministic_build = DeterministicBuilderFactory('Android')
-
 c['builders'] = [
   b_heartbeat,
   b_heartbeat_canary,
   b_chromium_linux_swarm,
   b_chromium_linux_swarm_dbg,
   b_chromium_win_swarm,
   b_chromium_win_swarm_dbg,
   b_chromium_mac_swarm,
   b_chromium_mac_swarm_dbg,
-  b_win_deterministic_build,
-  b_win_clang_deterministic_build,
-  b_linux_deterministic_build,
-  b_mac_deterministic_build,
-  b_android_deterministic_build,
 ]
 
 # Associate the slaves to the builders. The configuration is in slaves.cfg.
 slaves = slaves_list.SlavesList('slaves.cfg', 'ChromiumSwarm')
 for builder in c['builders']:
   builder['slavenames'] = slaves.GetSlavesName(builder=builder['name'])
 
 
 ####### BUILDSLAVES
 
@@ skipping 38 matching lines @@
     sendToInterestedUsers=False,
     extraRecipients=[
       'chrome-troopers+swarming@google.com',
     ]))
 
 
 ####### PROJECT IDENTITY
 
 c['projectName'] = ActiveMaster.project_name
 c['projectURL'] = config.Master.project_url