Remove DrMemory slaves from chromium.memory.full master.

masters/master.chromium.memory.full/master.cfg

Index: masters/master.chromium.memory.full/master.cfg
diff --git a/masters/master.chromium.memory.full/master.cfg b/masters/master.chromium.memory.full/master.cfg
index a16f0a7b41b081c23a8e32a7bd0b5673cbf68552..f1e2322c90fa06f0c2ae0f79e56ddd981236a67e 100644
--- a/masters/master.chromium.memory.full/master.cfg
+++ b/masters/master.chromium.memory.full/master.cfg
@@ -45,47 +45,11 @@ s_chromium = Scheduler(name='chromium',
                        branch='master',
                        treeStableTimer=60,
                        builderNames=[# Builders
-                                     'Chromium Windows Builder (DrMemory)',
-                                     'Chromium Windows Builder (DrMemory x64)',
                                      'Chromium Linux TSan Builder',
                                      'Chromium Linux MSan Builder',
                                      'Chromium Linux ChromeOS MSan Builder',
                                     ])
 
-# Windows Dr. Memory build-bot list
-t_drmemory_bots=[
-  'Windows Unit (DrMemory)',
-  'Windows Content Browser (DrMemory)',
-  ]
-
-# Windows Unit (DrMemory full)
-WINDOWS_UNIT_DRMEMORY_FULL_TESTERS = 5
-for i in range(WINDOWS_UNIT_DRMEMORY_FULL_TESTERS):
-    t_drmemory_bots.append('Windows Unit (DrMemory full) (%d)' % (i+1))
-
-# Windows Content Browser (DrMemory full)
-WINDOWS_CONTENT_BROWSER_DRMEMORY_FULL_TESTERS = 6
-for i in range(WINDOWS_CONTENT_BROWSER_DRMEMORY_FULL_TESTERS):
-    t_drmemory_bots.append('Windows Content Browser (DrMemory full) (%d)' % (i+1))
-
-# Windows Browser (DrMemory full)
-WINDOWS_BROWSER_DRMEMORY_FULL_TESTERS = 12
-for i in range(WINDOWS_BROWSER_DRMEMORY_FULL_TESTERS):
-    t_drmemory_bots.append('Windows Browser (DrMemory full) (%d)' % (i+1))
-
-# Windows Dr. Memory x64 build-bot list
-t_drmemory_64_bots=[
-  'Windows Unit (DrMemory x64)',
-  ]
-
-s_chromium_win_drmemory_trigger = Triggerable(
-    'chromium_win_drmemory',
-     t_drmemory_bots)
-
-s_chromium_win_drmemory_64_trigger = Triggerable(
-    'chromium_win_drmemory_64',
-     t_drmemory_64_bots)
-
 s_chromium_linux_tsan = Triggerable(
     name='linux_tsan',
     builderNames=['Linux TSan Tests'])
@@ -99,8 +63,6 @@ s_chromium_linux_chromeos_msan = Triggerable(
     builderNames=['Linux ChromeOS MSan Tests'])
 
 c['schedulers'] = [s_chromium,
-                   s_chromium_win_drmemory_trigger,
-                   s_chromium_win_drmemory_64_trigger,
                    s_chromium_linux_tsan,
                    s_chromium_linux_msan,
                    s_chromium_linux_chromeos_msan]
@@ -122,11 +84,6 @@ builders = []
 # ----------------------------------------------------------------------------
 # FACTORIES
 
-m_win_ninja = chromium_factory.ChromiumFactory('src/out', 'win32')
-
-# Some shortcut to simplify the code below.
-F_WIN_NINJA = m_win_ninja.ChromiumFactory
-
 m_annotator = annotator_factory.AnnotatorFactory()
 
 revision_getter = master_utils.ConditionalProperty(
@@ -144,12 +101,6 @@ def m_remote_run_chromium_src(recipe, **kwargs):
       use_gitiles=True,
       **kwargs)
 
-chromium_win_drmemory_archive = master_config.GetGSUtilUrl(
-    'chromium-memory-full', 'drm-cr')
-
-chromium_win_drmemory_64_archive = master_config.GetGSUtilUrl(
-    'chromium-memory-full', 'drm-cr-64')
-
 # IMPORTANT NOTE about adding new tests.
 # If you want to add a new test, make sure it's:
 # a) buildable,
@@ -161,10 +112,6 @@ chromium_win_drmemory_64_archive = master_config.GetGSUtilUrl(
 # Also, please do your best to estimate the time it takes to run the new test
 # under the tool and order the tests in a short-job-first manner if possible.
 #
-# Regarding (a),
-#   New DrMemory/Win tests must first be added as dependencies to the
-#     'chromium_builder_dbg_drmemory_win' target in src/build/all.gyp;
-#
 # Regarding (b),
 #   'chrome_tests.py' must be updated to handle the test name,
 #   without the 'TOOL_' prefix, where 'chrome_tests.py' is located
@@ -177,282 +124,6 @@ chromium_win_drmemory_64_archive = master_config.GetGSUtilUrl(
 # Please coordinate with the current and upcoming memory sheriff and help them
 # get the new tests green on all the bots after the master restart.
 
-# ThreadSanitizer bots:
-# Dr.Memory bots:
-f_chromium_rel_win_drmemory_builder = F_WIN_NINJA(
-    # TODO(timurrrr): reuse the builder for TSan/Win too once
-    # http://crbug.com/108155 is resolved.
-    slave_type='Builder',
-    target='Release',
-    # TODO(bruening): remove "_dbg" from this name in all.gyp as it is
-    # not limited to just Debug.
-    # TODO(timurrrr): Might wanna remove chromium_builder_dbg_drmemory_win
-    # entirely as ninja supports target lists similar to what we always had
-    # on Linux.
-    options=['chromium_builder_dbg_drmemory_win'],
-    factory_properties={
-      'gclient_env': {'GYP_DEFINES': ('build_for_tool=drmemory '
-                                      'component=shared_library '),
-                      'GYP_GENERATORS': 'ninja'},
-      'trigger': 'chromium_win_drmemory',
-      'build_url': chromium_win_drmemory_archive,
-      'use_mb': True,
-    }
-)
-
-f_chromium_rel_win_drmemory = F_WIN_NINJA(
-    slave_type='Tester',
-    target='Release',
-    build_url=chromium_win_drmemory_archive,
-    # See IMPORTANT NOTE above before adding new tests.
-    tests=[
-      'drmemory_light_url',
-      'drmemory_light_printing',
-      'drmemory_light_media',
-      'drmemory_light_midi',
-      'drmemory_light_sql',
-      'drmemory_light_crypto',
-      'drmemory_light_remoting',
-      'drmemory_light_ipc_tests',
-      'drmemory_light_base_unittests',
-      'drmemory_light_net',
-      'drmemory_light_components',
-      'drmemory_light_device',
-      'drmemory_light_jingle',
-      'drmemory_light_gcm',
-      'drmemory_light_gpu',
-      'drmemory_light_content',
-      'drmemory_light_cacheinvalidation',
-      'drmemory_light_addressinput',
-      'drmemory_light_phonenumber',
-      'drmemory_light_mojo_system',
-      'drmemory_light_mojo_public_system',
-      'drmemory_light_mojo_public_bindings',
-      'drmemory_light_mojo_public_sysperf',
-      'drmemory_light_mojo_common',
-      'drmemory_light_accessibility',
-      'drmemory_light_angle',
-      'drmemory_light_aura',
-      'drmemory_light_blink_heap',
-      'drmemory_light_blink_platform',
-      'drmemory_light_cast',
-      'drmemory_light_cc',
-      'drmemory_light_chrome_app',
-      'drmemory_light_chrome_elf',
-      'drmemory_light_chromedriver',
-      'drmemory_light_compositor',
-      'drmemory_light_courgette',
-      'drmemory_light_display',
-      'drmemory_light_extensions',
-      'drmemory_light_events',
-      'drmemory_light_gin',
-      'drmemory_light_google_apis',
-      'drmemory_light_gfx',
-      'drmemory_light_installer_util',
-      'drmemory_light_keyboard',
-      'drmemory_light_unit',
-    ],
-)
-
-# Windows Content Browser (DrMemory)
-f_chromium_rel_win_drmemory_content = F_WIN_NINJA(
-    slave_type='Tester',
-    target='Release',
-    build_url=chromium_win_drmemory_archive,
-    tests=[
-      'drmemory_light_content_browsertests',
-    ],
-    factory_properties={'halt_on_missing_build': True}
-)
-
-# Windows Unit (DrMemory full) (1)
-f_chromium_rel_win_drmemory_full_1 = F_WIN_NINJA(
-    slave_type='Tester',
-    target='Release',
-    build_url=chromium_win_drmemory_archive,
-    # See IMPORTANT NOTE above before adding new tests.
-    tests=[
-      # We split into 2 for faster reports on errors found in 1st half.
-      'drmemory_full_net_1_of_2',
-      'drmemory_full_net_2_of_2',
-      'drmemory_full_mojo_system',
-      'drmemory_full_mojo_public_system',
-      'drmemory_full_mojo_public_bindings',
-      'drmemory_full_mojo_public_sysperf',
-      'drmemory_full_mojo_common',
-    ],
-    factory_properties={'halt_on_missing_build': True},
-)
-
-# Windows Unit (DrMemory full) (2)
-f_chromium_rel_win_drmemory_full_2 = F_WIN_NINJA(
-    slave_type='Tester',
-    target='Release',
-    build_url=chromium_win_drmemory_archive,
-    # See IMPORTANT NOTE above before adding new tests.
-    tests=[
-      # The 1st 3 unit_ shards are fast, so we can fit these as well:
-      'drmemory_full_media',
-      'drmemory_full_midi',
-      'drmemory_full_base_unittests',
-      # Full mode has a high memory overhead currently, so shard the tests
-      # more.
-      'drmemory_full_unit_1_of_6',
-      'drmemory_full_unit_2_of_6',
-    ],
-    factory_properties={'halt_on_missing_build': True},
-)
-
-# Windows Unit (DrMemory full) (3)
-f_chromium_rel_win_drmemory_full_3 = F_WIN_NINJA(
-    slave_type='Tester',
-    target='Release',
-    build_url=chromium_win_drmemory_archive,
-    # See IMPORTANT NOTE above before adding new tests.
-    tests=[
-      # Full mode has a high memory overhead currently, so shard the tests
-      # more.
-      'drmemory_full_url',
-      'drmemory_full_printing',
-      'drmemory_full_sql',
-      'drmemory_full_crypto',
-      'drmemory_full_remoting',
-      'drmemory_full_ipc_tests',
-      'drmemory_full_gpu',
-      'drmemory_full_device',
-      'drmemory_full_jingle',
-      'drmemory_full_gcm',
-      'drmemory_full_content',
-      'drmemory_full_cacheinvalidation',
-      'drmemory_full_addressinput',
-      'drmemory_full_unit_3_of_6',
-      'drmemory_full_unit_4_of_6',
-    ],
-    factory_properties={'halt_on_missing_build': True},
-)
-
-# Windows Unit (DrMemory full) (4)
-f_chromium_rel_win_drmemory_full_4 = F_WIN_NINJA(
-    slave_type='Tester',
-    target='Release',
-    build_url=chromium_win_drmemory_archive,
-    # See IMPORTANT NOTE above before adding new tests.
-    tests=[
-      # Full mode has a high memory overhead currently, so shard the tests
-      # more.
-      'drmemory_full_phonenumber',
-      'drmemory_full_unit_5_of_6',
-      'drmemory_full_unit_6_of_6',
-    ],
-    factory_properties={'halt_on_missing_build': True},
-)
-
-# Windows Unit (DrMemory full) (5)
-f_chromium_rel_win_drmemory_full_5 = F_WIN_NINJA(
-    slave_type='Tester',
-    target='Release',
-    build_url=chromium_win_drmemory_archive,
-    # See IMPORTANT NOTE above before adding new tests.
-    tests=[
-      'drmemory_full_accessibility',
-      'drmemory_full_angle',
-      'drmemory_full_aura',
-      'drmemory_full_blink_heap',
-      'drmemory_full_blink_platform',
-      'drmemory_full_cast',
-      'drmemory_full_cc',
-      'drmemory_full_chrome_app',
-      'drmemory_full_chrome_elf',
-      'drmemory_full_chromedriver',
-      'drmemory_full_compositor',
-      'drmemory_full_courgette',
-      'drmemory_full_display',
-      'drmemory_full_extensions',
-      'drmemory_full_events',
-      'drmemory_full_gin',
-      'drmemory_full_google_apis',
-      'drmemory_full_gfx',
-      'drmemory_full_installer_util',
-      'drmemory_full_keyboard',
-    ],
-    factory_properties={'halt_on_missing_build': True},
-)
-
-# DrMemory x64 Builder
-f_chromium_rel_win_drmemory_64_builder = F_WIN_NINJA(
-    slave_type='Builder',
-    target='Release_x64',
-    # TODO(bruening): remove "_dbg" from this name in all.gyp as it is
-    # not limited to just Debug.
-    options=['chromium_builder_dbg_drmemory_win'],
-    factory_properties={
-      'gclient_env': {
-        'GYP_DEFINES' : (
-            'build_for_tool=drmemory component=shared_library '
-            'target_arch=x64'),
-        'GYP_GENERATORS': 'ninja',
-      },
-      'trigger': 'chromium_win_drmemory_64',
-      'build_url': chromium_win_drmemory_64_archive,
-      'use_mb': True,
-    }
-)
-
-# Windows Unit (DrMemory x64)
-f_chromium_rel_win_drmemory_64 = F_WIN_NINJA(
-    slave_type='Tester',
-    target='Release_x64',
-    build_url=chromium_win_drmemory_64_archive,
-    tests=[
-      'drmemory_light_url',
-      'drmemory_light_printing',
-      'drmemory_light_media',
-      'drmemory_light_midi',
-      'drmemory_light_sql',
-      'drmemory_light_crypto',
-      'drmemory_light_remoting',
-      'drmemory_light_ipc_tests',
-      'drmemory_light_base_unittests',
-      'drmemory_light_net',
-      'drmemory_light_components',
-      'drmemory_light_device',
-      'drmemory_light_jingle',
-      'drmemory_light_gcm',
-      'drmemory_light_gpu',
-      'drmemory_light_content',
-      'drmemory_light_cacheinvalidation',
-      'drmemory_light_addressinput',
-      'drmemory_light_phonenumber',
-      'drmemory_light_mojo_system',
-      'drmemory_light_mojo_public_system',
-      'drmemory_light_mojo_public_bindings',
-      'drmemory_light_mojo_public_sysperf',
-      'drmemory_light_mojo_common',
-      'drmemory_light_accessibility',
-      'drmemory_light_angle',
-      'drmemory_light_aura',
-      'drmemory_light_blink_heap',
-      'drmemory_light_blink_platform',
-      'drmemory_light_cast',
-      'drmemory_light_cc',
-      'drmemory_light_chrome_app',
-      'drmemory_light_chrome_elf',
-      'drmemory_light_chromedriver',
-      'drmemory_light_compositor',
-      'drmemory_light_courgette',
-      'drmemory_light_display',
-      'drmemory_light_extensions',
-      'drmemory_light_events',
-      'drmemory_light_gin',
-      'drmemory_light_google_apis',
-      'drmemory_light_gfx',
-      'drmemory_light_installer_util',
-      'drmemory_light_keyboard',
-      'drmemory_light_unit',
-    ],
-    factory_properties={'halt_on_missing_build': True}
-)
-
 # Tests that are single-machine shard-safe.
 sharded_tests = [
   'aura_unittests',
@@ -502,87 +173,6 @@ sharded_tests = [
 #                       look for to close the tree.
 #
 
-b_chromium_rel_win_drmemory_builder = {
-  'name': 'Chromium Windows Builder (DrMemory)',
-  # make the dir short for ninja build
-  'builddir': 'drm-cr',
-  'factory': f_chromium_rel_win_drmemory_builder,
-  'category': '6DrMemory Light|compile',
-  'auto_reboot': True,
-}
-
-b_chromium_rel_win_drmemory = {
-  'name': 'Windows Unit (DrMemory)',
-  'builddir': 'chromium-dbg-win-drmemory',
-  'factory': f_chromium_rel_win_drmemory,
-  'category': '6DrMemory Light|drmemory_tester',
-  'auto_reboot': True,
-}
-
-b_chromium_rel_win_drmemory_content = {
-  'name': 'Windows Content Browser (DrMemory)',
-  'builddir': 'windows-content-drm-light',
-  'factory': f_chromium_rel_win_drmemory_content,
-  'category': '6DrMemory Light|drmemory_tester',
-  'auto_reboot': True,
-}
-
-b_chromium_rel_win_drmemory_full_1 = {
-  'name': 'Windows Unit (DrMemory full) (1)',
-  'builddir': 'chromium-dbg-win-drmemory-full-1',
-  'factory': f_chromium_rel_win_drmemory_full_1,
-  'category': '7DrMemory Full|drmemory_tester',
-  'auto_reboot': True,
-}
-
-b_chromium_rel_win_drmemory_full_2 = {
-  'name': 'Windows Unit (DrMemory full) (2)',
-  'builddir': 'chromium-dbg-win-drmemory-full-2',
-  'factory': f_chromium_rel_win_drmemory_full_2,
-  'category': '7DrMemory Full|drmemory_tester',
-  'auto_reboot': True,
-}
-
-b_chromium_rel_win_drmemory_full_3 = {
-  'name': 'Windows Unit (DrMemory full) (3)',
-  'builddir': 'chromium-dbg-win-drmemory-full-3',
-  'factory': f_chromium_rel_win_drmemory_full_3,
-  'category': '7DrMemory Full|drmemory_tester',
-  'auto_reboot': True,
-}
-
-b_chromium_rel_win_drmemory_full_4 = {
-  'name': 'Windows Unit (DrMemory full) (4)',
-  'builddir': 'chromium-dbg-win-drmemory-full-4',
-  'factory': f_chromium_rel_win_drmemory_full_4,
-  'category': '7DrMemory Full|drmemory_tester',
-  'auto_reboot': True,
-}
-
-b_chromium_rel_win_drmemory_full_5 = {
-  'name': 'Windows Unit (DrMemory full) (5)',
-  'builddir': 'chromium-dbg-win-drmemory-full-5',
-  'factory': f_chromium_rel_win_drmemory_full_5,
-  'category': '7DrMemory Full|drmemory_tester',
-  'auto_reboot': True,
-}
-
-b_chromium_rel_win_drmemory_64_builder = {
-  'name': 'Chromium Windows Builder (DrMemory x64)',
-  'builddir': 'drm-cr-64',
-  'factory': f_chromium_rel_win_drmemory_64_builder,
-  'category': '9DrMemory x64|compile',
-  'auto_reboot': True,
-}
-
-b_chromium_rel_win_drmemory_64 = {
-  'name': 'Windows Unit (DrMemory x64)',
-  'builddir': 'chromium-dbg-win-drm-64',
-  'factory': f_chromium_rel_win_drmemory_64,
-  'category': '9DrMemory x64|drmemory_tester',
-  'auto_reboot': True,
-}
-
 b_chromium_rel_linux_tsan_builder = {
   'name': 'Chromium Linux TSan Builder',
   'factory': m_remote_run_chromium_src('chromium', triggers=['linux_tsan']),
@@ -625,89 +215,14 @@ b_chromium_rel_linux_chromeos_msan = {
   'auto_reboot': True,
 }
 
-
-# DrMemory test bots
-b_win_drmemory = [
-  b_chromium_rel_win_drmemory_builder,
-  b_chromium_rel_win_drmemory,
-  b_chromium_rel_win_drmemory_content,
-  b_chromium_rel_win_drmemory_full_1,
-  b_chromium_rel_win_drmemory_full_2,
-  b_chromium_rel_win_drmemory_full_3,
-  b_chromium_rel_win_drmemory_full_4,
-  b_chromium_rel_win_drmemory_full_5,
-  b_chromium_rel_win_drmemory_64_builder,
-  b_chromium_rel_win_drmemory_64,
-]
-
-# We shard content_browsertests within each bot to reduce timeout consequences.
-DRMEMORY_CONTENT_SHARDS_PER_BOT = 10
-def windows_content_browser_drmemory_full_tester(shard, total):
-  if shard < 1 or shard > total:
-    raise
-  ret = {'category': '7DrMemory Full|drmemory_tester'}
-  ret['name'] = 'Windows Content Browser (DrMemory full) (%d)' % shard
-  ret['builddir'] = 'windows-content-browser-drm-full-%d' % shard
-  ret['auto_reboot'] = True
-  testlist = []
-  for i in range(DRMEMORY_CONTENT_SHARDS_PER_BOT):
-    testlist.append(
-      'drmemory_full_content_browsertests_%d_of_%d' %
-      ((shard-1)*DRMEMORY_CONTENT_SHARDS_PER_BOT+i+1,
-       total*DRMEMORY_CONTENT_SHARDS_PER_BOT))
-  ret['factory'] = F_WIN_NINJA(
-      slave_type='Tester',
-      target='Release',
-      build_url=chromium_win_drmemory_archive,
-      tests=testlist,
-      options=['content_browsertests'],
-      factory_properties={ 'halt_on_missing_build': True})
-  return ret
-
-# Windows Content Browser (DrMemory full)
-for i in range(WINDOWS_CONTENT_BROWSER_DRMEMORY_FULL_TESTERS):
-  b_win_drmemory.append(
-      windows_content_browser_drmemory_full_tester(
-          i + 1, WINDOWS_CONTENT_BROWSER_DRMEMORY_FULL_TESTERS))
-
-DRMEMORY_BROWSER_SHARDS_PER_BOT = 4
-def windows_browser_drmemory_full_tester(shard, total):
-  if shard < 1 or shard > total:
-    raise
-  ret = {'category': '8DrMemory Full (Browser Tests)|drmemory_tester'}
-  ret['name'] = 'Windows Browser (DrMemory full) (%d)' % shard
-  ret['builddir'] = 'windows-browser-drm-full-%d' % shard
-  testlist = []
-  for i in range(DRMEMORY_BROWSER_SHARDS_PER_BOT):
-    testlist.append(
-      'drmemory_full_browser_tests_%d_of_%d' %
-      ((shard-1)*DRMEMORY_BROWSER_SHARDS_PER_BOT+i+1,
-       total*DRMEMORY_BROWSER_SHARDS_PER_BOT))
-  ret['factory'] = F_WIN_NINJA(
-      target='Release',
-      slave_type='Tester',
-      build_url=chromium_win_drmemory_archive,
-      tests=testlist,
-      options=['browser_tests'],
-      factory_properties={ 'halt_on_missing_build': True})
-  return ret
-
-# Windows Browser (DrMemory full)
-for i in range(WINDOWS_BROWSER_DRMEMORY_FULL_TESTERS):
-  b_win_drmemory.append(
-      windows_browser_drmemory_full_tester(
-          i + 1, WINDOWS_BROWSER_DRMEMORY_FULL_TESTERS))
-
-c['builders'] = b_win_drmemory
-
-c['builders'].extend([
+c['builders'] = [
   b_chromium_rel_linux_tsan_builder,
   b_chromium_rel_linux_tsan,
   b_chromium_rel_linux_msan_builder,
   b_chromium_rel_linux_msan,
   b_chromium_rel_linux_chromeos_msan_builder,
   b_chromium_rel_linux_chromeos_msan,
-])
+]
 
 # Associate the slaves to the manual builders. The configuration is in
 # slaves.cfg.