Sanitizer spring cleaning

master/slaves.cfg

Index: master/slaves.cfg
diff --git a/master/slaves.cfg b/master/slaves.cfg
index 541c8913950029fd149c9d0565043b1e02058cca..b2003d858927e576be626a5785b04250d54a04be 100644
--- a/master/slaves.cfg
+++ b/master/slaves.cfg
@@ -47,7 +47,6 @@ LINUX_COMPILE_BUILDERS = [
   'Build-Ubuntu13.10-GCC4.8-x86-Release-IntelRhb',
   'Build-Ubuntu13.10-GCC4.8-x86-Debug-Alex',
   'Build-Ubuntu13.10-GCC4.8-x86-Release-Alex',
-  'Build-Ubuntu13.10-GCC4.8-x86_64-Release-Valgrind',
   'Build-Ubuntu13.10-GCC4.8-x86_64-Debug-Link',
   'Build-Ubuntu13.10-GCC4.8-x86_64-Release-Link',
   'Build-Ubuntu13.10-GCC4.8-Arm7-Debug-Daisy',
@@ -56,8 +55,6 @@ LINUX_COMPILE_BUILDERS = [
   'Build-Ubuntu13.10-GCC4.8-Arm7-Debug-NvidiaLogan',
   'Build-Ubuntu13.10-GCC4.8-Arm7-Release-NvidiaLogan',
   'Build-Ubuntu13.10-Clang-x86_64-Debug',
-  'Build-Ubuntu13.10-Clang-x86_64-Debug-ASAN',
-  'Build-Ubuntu13.10-Clang-x86_64-Debug-TSAN',
 ]
 
 
@@ -313,7 +310,7 @@ slaves = [SelfReferenceFormat(d) for d in [
     'master': 'Skia',
     'hostname': 'skiabot-linux-sanitizer-%s-A' % ('%d' % i).zfill(INTEGER_WIDTH),
     'builder': [
-        'Test-Ubuntu13.10-ShuttleA-HD2000-x86_64-Debug-ASAN',
+        'Test-Ubuntu13.10-GCE-NoGPU-x86_64-Debug-ASAN',
         ],
     'num_cores': '8',
   } for i in xrange(4)
@@ -626,7 +623,7 @@ slaves = [SelfReferenceFormat(d) for d in [
     'master': 'FYISkia',
     'hostname': 'skiabot-linux-sanitizer-%s-T' % ('%d' % i).zfill(INTEGER_WIDTH),
     'builder': [
-        'Test-Ubuntu13-ShuttleA-HD2000-x86_64-Debug-TSAN',
+        'Test-Ubuntu13.10-GCE-NoGPU-x86_64-Release-TSAN',
         ],
     'num_cores': '8',
   } for i in xrange(4)