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

masters/master.chromium.swarm/master.cfg

Index: masters/master.chromium.swarm/master.cfg
diff --git a/masters/master.chromium.swarm/master.cfg b/masters/master.chromium.swarm/master.cfg
index b50b566082e3d65ebcdb4547f7910dc0c45beada..54a56451ad3fad48cb1a84592921525e5e9676ca 100644
--- a/masters/master.chromium.swarm/master.cfg
+++ b/masters/master.chromium.swarm/master.cfg
@@ -70,23 +70,6 @@ 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',
@@ -155,12 +138,6 @@ b_chromium_mac_swarm_dbg = {
   '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,
@@ -170,11 +147,6 @@ c['builders'] = [
   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.