Remove Mac Valgrind from the memory.fyi waterfall.

masters/master.chromium.memory.fyi/master.cfg

 # 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 Triggerable
 from buildbot.scheduler import Scheduler
 
 from common import chromium_utils
 
 # These modules come from scripts/master, which must be in the PYTHONPATH.
@@ skipping 28 matching lines @@
 ## configure the Schedulers
 
 # Main scheduler for all changes in trunk.
 s_chromium = Scheduler(name='chromium',
                        branch='master',
                        treeStableTimer=60,
                        builderNames=[# Builders
                                      'Chromium Windows Builder (DrMemory)',
                                      'Chromium Windows Builder (DrMemory x64)',
                                      'Chromium Linux Builder (valgrind)',
-                                     'Chromium Mac Builder (valgrind)',
                                      'Chromium OS Builder (valgrind)',
                                      '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)',
@@ skipping 29 matching lines @@
 
 s_chromium_linux_valgrind_trigger = Triggerable(
     'chromium_linux_valgrind',
     ['Linux Tests (valgrind)(1)',
      'Linux Tests (valgrind)(2)',
      'Linux Tests (valgrind)(3)',
      'Linux Tests (valgrind)(4)',
      'Linux Tests (valgrind)(5)',
     ])
 
-s_chromium_mac_valgrind_trigger = Triggerable(
-    'chromium_mac_valgrind',
-    ['Chromium Mac (valgrind)(1)',
-     'Chromium Mac (valgrind)(2)',
-    ])
-
 s_chromium_chromeos_valgrind_trigger = Triggerable(
     'chromium_chromeos_valgrind',
     ['Chromium OS (valgrind)(1)',
      'Chromium OS (valgrind)(2)',
      'Chromium OS (valgrind)(3)',
      'Chromium OS (valgrind)(4)',
      'Chromium OS (valgrind)(5)',
      'Chromium OS (valgrind)(6)',
     ])
 
 s_chromium_linux_tsan = Triggerable(
     name='linux_tsan',
     builderNames=['Linux TSan Tests'])
 
 s_chromium_linux_msan = Triggerable(
     name='linux_msan',
     builderNames=['Linux MSan Tests'])
 
 s_chromium_linux_chromeos_msan = Triggerable(
     name='linux_chromeos_msan',
     builderNames=['Linux ChromeOS MSan Tests'])
 
 c['schedulers'] = [s_chromium,
                    s_chromium_win_drmemory_trigger,
                    s_chromium_win_drmemory_64_trigger,
                    s_chromium_linux_valgrind_trigger,
-                   s_chromium_mac_valgrind_trigger,
                    s_chromium_chromeos_valgrind_trigger,
                    s_chromium_linux_tsan,
                    s_chromium_linux_msan,
                    s_chromium_linux_chromeos_msan]
 
 ####### BUILDERS
 
 # buildbot/process/factory.py provides several BuildFactory classes you can
 # start with, which implement build processes for common targets (GNU
 # autoconf projects, CPAN perl modules, etc). The factory.BuildFactory is the
 # base class, and is configured with a series of BuildSteps. When the build
 # is run, the appropriate buildslave is told to execute each Step in turn.
 
 # the first BuildStep is typically responsible for obtaining a copy of the
 # sources. There are source-obtaining Steps in buildbot/process/step.py for
 # CVS, SVN, and others.
 
 builders = []
 
 # ----------------------------------------------------------------------------
 # FACTORIES
 
 m_win = chromium_factory.ChromiumFactory('src/build', 'win32')
 m_win_ninja = chromium_factory.ChromiumFactory('src/out', 'win32')
 m_linux = chromium_factory.ChromiumFactory('src/out', 'linux2')
-m_mac = chromium_factory.ChromiumFactory('src/xcodebuild', 'darwin')
 m_chromeos = chromium_factory.ChromiumFactory('src/out', 'linux2')
 
 # Some shortcut to simplify the code below.
 F_WIN = m_win.ChromiumFactory
 F_WIN_NINJA = m_win_ninja.ChromiumFactory
 F_LINUX = m_linux.ChromiumFactory
-F_MAC = m_mac.ChromiumFactory
 F_CR_OS = m_chromeos.ChromiumOSFactory
 
 m_annotator = annotator_factory.AnnotatorFactory()
 
 chromium_win_drmemory_archive = master_config.GetGSUtilUrl(
     'chromium-memory-fyi', 'drm-cr')
 
 chromium_win_drmemory_64_archive = master_config.GetGSUtilUrl(
     'chromium-memory-fyi', 'drm-cr-64')
 
 chromium_linux_valgrind_archive = master_config.GetGSUtilUrl(
     'chromium-memory-fyi', 'chromium-rel-linux-valgrind-builder')
 
-chromium_mac_valgrind_archive = master_config.GetGSUtilUrl(
-    'chromium-memory-fyi', 'chromium-rel-mac-valgrind-builder')
-
 chromium_chromeos_valgrind_archive = master_config.GetGSUtilUrl(
     'chromium-memory-fyi', 'chromium-rel-chromeos-valgrind-builder')
 
 valgrind_cros_gyp_defines = 'build_for_tool=memcheck chromeos=1'
-valgrind_mac_gyp_defines = 'build_for_tool=memcheck'
 
 # IMPORTANT NOTE about adding new tests.
 # If you want to add a new test, make sure it's:
 # a) buildable,
 # b) runnable by all the tools,
 # c) green locally under all tools (at least mostly) and
 # d) the e-mail notifier is configured to watch for its failures.
 # [See details below]
 #
 # 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 Valgrind/Mac tests must first be added as dependencies to the
-#     'chromium_builder_dbg_valgrind_mac' target in src/build/all.gyp;
 #   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
 #     at tools/valgrind/ for other tools.
 #
 # Regarding (d),
 #   See notifier_cfg.py for the existing tests and see the 'category' of the
 #   builder you're dealing with.
 #
 # 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.
 
 f_chromium_rel_linux_valgrind = m_annotator.BaseFactory('chromium')
 
-# Mac Valgrind bots:
-# We use debug builds for mac valgrind bots because we can't get stacks on
-# release builds.
-f_cr_rel_mac_valgrind_builder = F_MAC(
-    slave_type='Builder',
-    target='Debug',
-    factory_properties={
-        'gclient_env': { 'GYP_DEFINES' : valgrind_mac_gyp_defines },
-        'trigger': 'chromium_mac_valgrind',
-        'build_url': chromium_mac_valgrind_archive,
-    },
-    options=[
-        '--compiler=goma-clang', '--', '-project', '../build/all.xcodeproj',
-        '-target', 'chromium_builder_dbg_valgrind_mac'])
-
-# unit_tests are disabled under Valgrind on Mac OS because of crbug.com/51716.
-# content_unittests are similarly disabled due to crbug.com/435344.
-# We're still building them to be able to reproduce the crashes on bots.
-f_cr_dbg_mac_valgrind_1 = F_MAC(
-    build_url=chromium_mac_valgrind_archive,
-    slave_type='Tester',
-    factory_properties={ 'needs_valgrind' : True, },
-    # See IMPORTANT NOTE above before adding new tests.
-    tests=['valgrind_base_unittests',
-           'valgrind_crypto',
-           'valgrind_url',
-           'valgrind_ipc_tests',
-           'valgrind_media',
-           'valgrind_midi',
-           'valgrind_printing',
-           'valgrind_sql',
-           'valgrind_ui_base_unittests',
-           # See above.
-           #'valgrind_unit_1_of_4',
-           #'valgrind_unit_2_of_4',
-           ])
-
-f_cr_dbg_mac_valgrind_2 = F_MAC(
-    build_url=chromium_mac_valgrind_archive,
-    slave_type='Tester',
-    factory_properties={ 'needs_valgrind' : True, },
-    # See IMPORTANT NOTE above before adding new tests.
-    tests=['valgrind_net',
-           'valgrind_remoting',
-           # See above.
-           #'valgrind_content',
-           #'valgrind_unit_3_of_4',
-           #'valgrind_unit_4_of_4',
-           ])
-
 # ChromeOS Valgrind bots:
 f_chromium_rel_chromeos_valgrind_builder = F_CR_OS(
     target='Release',
     slave_type='Builder',
     options=['--compiler=goma',
              'app_list_unittests',
              'ash_unittests',
              'aura_unittests',
              'base_unittests',
              'chromeos_unittests',
@@ skipping 475 matching lines @@
 }
 
 b_chromium_rel_linux_valgrind_tests_5 = {
   'name': 'Linux Tests (valgrind)(5)',
   'builddir': 'chromium-rel-linux-valgrind-tests-5',
   'factory': f_chromium_rel_linux_valgrind,
   'category': '1Linux Valgrind|memory_tester',
   'auto_reboot': True,
 }
 
-b_chromium_rel_mac_valgrind_builder = {
-  'name': 'Chromium Mac Builder (valgrind)',
-  'builddir': 'chromium-rel-mac-valgrind-builder',
-  'factory': f_cr_rel_mac_valgrind_builder,
-  'category': '2Mac Valgrind|compile',
-  'auto_reboot': False,
-}
-
-b_chromium_dbg_mac_valgrind_1 = {
-  'name': 'Chromium Mac (valgrind)(1)',
-  'builddir': 'chromium-dbg-mac-valgrind-1',
-  'factory': f_cr_dbg_mac_valgrind_1,
-  'category': '2Mac Valgrind|memory_tester',
-  'auto_reboot': True,
-}
-
-b_chromium_dbg_mac_valgrind_2 = {
-  'name': 'Chromium Mac (valgrind)(2)',
-  'builddir': 'chromium-dbg-mac-valgrind-2',
-  'factory': f_cr_dbg_mac_valgrind_2,
-  'category': '2Mac Valgrind|memory_tester',
-  'auto_reboot': True,
-}
-
 b_chromium_rel_chromeos_valgrind_builder = {
   'name': 'Chromium OS Builder (valgrind)',
   'builddir': 'chromium-rel-chromeos-valgrind-builder',
   'factory': f_chromium_rel_chromeos_valgrind_builder,
   'category': '3ChromeOS Valgrind|compile',
   'auto_reboot': False,
 }
 
 b_chromium_rel_chromeos_valgrind_1 = {
   'name': 'Chromium OS (valgrind)(1)',
@@ skipping 171 matching lines @@
 
 
 c['builders'] = [
   b_chromium_rel_linux_valgrind_builder,
   b_chromium_rel_linux_valgrind_tests_1,
   b_chromium_rel_linux_valgrind_tests_2,
   b_chromium_rel_linux_valgrind_tests_3,
   b_chromium_rel_linux_valgrind_tests_4,
   b_chromium_rel_linux_valgrind_tests_5,
 
-  b_chromium_rel_mac_valgrind_builder,
-  b_chromium_dbg_mac_valgrind_1,
-  b_chromium_dbg_mac_valgrind_2,
-
   b_chromium_rel_chromeos_valgrind_builder,
   b_chromium_rel_chromeos_valgrind_1,
   b_chromium_rel_chromeos_valgrind_2,
   b_chromium_rel_chromeos_valgrind_3,
   b_chromium_rel_chromeos_valgrind_4,
   b_chromium_rel_chromeos_valgrind_5,
   b_chromium_rel_chromeos_valgrind_6,
 ]
 
 # DrMemory test bots
@@ skipping 104 matching lines @@
 # Adds common status and tools to this master.
 master_utils.AutoSetupMaster(c, ActiveMaster,
     public_html='../master.chromium/public_html',
     templates=['../master.chromium/templates'],
     tagComparator=master_poller.comparator,
     enable_http_status_push=ActiveMaster.is_production_host)
 
 if ActiveMaster.is_production_host:
   import notifier_cfg
   notifier_cfg.Update(config, ActiveMaster, c)