Sanitizer spring cleaning

master/slaves.cfg

 # -*- python -*-
 # ex: set syntax=python:
 
 # Copyright (c) 2011 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.
 
 # See master.experimental/slaves.cfg for documentation.
 
 
@@ skipping 29 matching lines @@
   'Build-Ubuntu13.10-GCC4.8-Arm7-Debug-Nexus4',
   'Build-Ubuntu13.10-GCC4.8-Arm7-Release-Nexus4',
   'Build-Ubuntu13.10-GCC4.8-Arm7-Debug-Nexus7',
   'Build-Ubuntu13.10-GCC4.8-Arm7-Release-Nexus7',
   'Build-Ubuntu13.10-GCC4.8-Arm7-Debug-Nexus10',
   'Build-Ubuntu13.10-GCC4.8-Arm7-Release-Nexus10',
   'Build-Ubuntu13.10-GCC4.8-x86-Debug-IntelRhb',
   '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',
   'Build-Ubuntu13.10-GCC4.8-Arm7-Release-Daisy',
   'Build-Ubuntu13.10-GCC4.8-Mips-Debug-Mips',
   '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',
 ]
 
 
 def _Format(obj, dictionary):
   """ Recursively apply the dictionary to any format strings in the requested
   object. Returns a copy and does not modify the original. """
   if isinstance(obj, str):
     return obj % dictionary
   if isinstance(obj, list):
     return [_Format(item, dictionary) for item in obj]
@@ skipping 235 matching lines @@
 
         ],
     'ssh_host': '192.168.1.134',
     'ssh_port': '22',
   },
 ] + [
   {
     '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)
 ] + [
   {
     'master': 'Skia',
     'hostname': 'skiabot-shuttle-ubuntu12-gtx550ti-001',
     'builder': [
         'Test-Ubuntu12-ShuttleA-GTX550Ti-x86_64-Debug-ZeroGPUCache',
         'Test-Ubuntu12-ShuttleA-GTX550Ti-x86_64-Release-Valgrind',
@@ skipping 292 matching lines @@
         'Canary-Moz2D-Ubuntu12-GCC-x86_64-Release',
         ],
     'num_cores': '8',
   },
 
 ] + [
   {
     '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)
 ] + [
 
   {
     'master': 'FYISkia',
     'hostname': 'skiabot-shuttle-ubuntu13-003',
     'builder': [
         'Housekeeper-Nightly-Monitoring',
@@ skipping 38 matching lines @@
 
 cq_trybots = [
   'Build-Mac10.8-Clang-x86-Release-Trybot',
   'Build-Ubuntu13.10-GCC4.8-x86_64-Release-Trybot',
   'Build-Ubuntu13.10-GCC4.8-Arm7-Debug-Nexus7-Trybot',
   'Test-Ubuntu13.10-ShuttleA-NoGPU-x86_64-Debug-Trybot',
   # The Win7 compile trybot is currently disabled, because those bots are slow
   # and tend to lag behind.
   # 'Build-Win7-VS2010-x86-Release-Trybot',
 ]