Bug 1317758 - Remove linux64-cc and linux64-tsan from buildbot-configs. r=Callek
authorRyan VanderMeulen <ryanvm@gmail.com>
Tue, 15 Nov 2016 17:14:36 -0500
changeset 14708 a28fcb0b762511311a748d47df571c70435bd9e1
parent 14707 70e7c9c16516e234e1d5a7534ab3bb88b7746fbf
child 14709 3dda8f45e67447d150c2ab638e14f1856096b727
push id10313
push userryanvm@gmail.com
push dateMon, 21 Nov 2016 16:52:02 +0000
reviewersCallek
bugs1317758
Bug 1317758 - Remove linux64-cc and linux64-tsan from buildbot-configs. r=Callek
mozilla-tests/config.py
mozilla-tests/config_seta.py
mozilla/config.py
--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -63,18 +63,16 @@ TWIGS = [x for x in ACTIVE_PROJECT_BRANC
 
 setMainFirefoxVersions(BRANCHES)
 
 # Talos
 PLATFORMS = {
     'linux': {},
     'linux64': {},
     'linux64-asan': {},
-    'linux64-cc': {},
-    'linux64-tsan': {},
     'macosx64': {},
     'win32': {},
     'win64': {},
 }
 
 PLATFORMS['macosx64']['slave_platforms'] = ['snowleopard', 'yosemite', 'yosemite_r7']
 PLATFORMS['macosx64']['env_name'] = 'mac-perf'
 PLATFORMS['macosx64']['snowleopard'] = {'name': "Rev4 MacOSX Snow Leopard 10.6",
@@ -155,55 +153,16 @@ PLATFORMS['linux64-asan']['ubuntu64-asan
 PLATFORMS['linux64-asan']['stage_product'] = 'firefox'
 PLATFORMS['linux64-asan']['mozharness_config'] = {
     'mozharness_python': '/tools/buildbot/bin/python',
     'hg_bin': 'hg',
     'reboot_command': ['/tools/buildbot/bin/python'] + MOZHARNESS_REBOOT_CMD,
     'config_file': 'talos/linux_config.py',
 }
 
-PLATFORMS['linux64-tsan']['slave_platforms'] = ['ubuntu64_vm', 'ubuntu64_vm_lnx_large']
-PLATFORMS['linux64-tsan']['ubuntu64_vm'] = {
-    'name': 'Ubuntu TSAN VM 12.04 x64',
-    'build_dir_prefix': 'ubuntu64_vm_tsan',
-    'scheduler_slave_platform_identifier': 'ubuntu64_vm_tsan'
-}
-PLATFORMS['linux64-tsan']['ubuntu64_vm_lnx_large'] = {
-    'name': 'Ubuntu TSAN VM large 12.04 x64',
-    'build_dir_prefix': 'ubuntu64_vm_large_tsan',
-    'scheduler_slave_platform_identifier': 'ubuntu64_vm_large_tsan'
-}
-PLATFORMS['linux64-tsan']['stage_product'] = 'firefox'
-PLATFORMS['linux64-tsan']['mozharness_config'] = {
-    'mozharness_python': '/tools/buildbot/bin/python',
-    'hg_bin': 'hg',
-    'reboot_command': ['/tools/buildbot/bin/python'] + MOZHARNESS_REBOOT_CMD,
-    'config_file': 'talos/linux_config.py',
-}
-
-PLATFORMS['linux64-cc']['slave_platforms'] = ['ubuntu64_vm', 'ubuntu64_vm_lnx_large']
-PLATFORMS['linux64-cc']['ubuntu64_vm'] = {
-    'name': 'Ubuntu Code Coverage VM 12.04 x64',
-    'build_dir_prefix': 'ubuntu64_vm_cc',
-    'scheduler_slave_platform_identifier': 'ubuntu64_vm_cc'
-}
-PLATFORMS['linux64-cc']['ubuntu64_vm_lnx_large'] = {
-    'name': 'Ubuntu Code Coverage VM large 12.04 x64',
-    'build_dir_prefix': 'ubuntu64_vm_large_cc',
-    'scheduler_slave_platform_identifier': 'ubuntu64_vm_large_cc'
-}
-PLATFORMS['linux64-cc']['stage_product'] = 'firefox'
-PLATFORMS['linux64-cc']['mozharness_config'] = {
-    'mozharness_python': '/tools/buildbot/bin/python',
-    'hg_bin': 'hg',
-    'reboot_command': ['/tools/buildbot/bin/python'] + MOZHARNESS_REBOOT_CMD,
-    'system_bits': '64',
-    'extra_args': ['--code-coverage'],
-}
-
 # Lets be explicit instead of magical.
 for platform, platform_config in PLATFORMS.iteritems():
     all_slave_platforms = set(platform_config['slave_platforms'] +
                               platform_config.get('talos_slave_platforms', []))
     for slave_platform in all_slave_platforms:
         platform_config[slave_platform]['slaves'] = sorted(SLAVES[slave_platform])
         if slave_platform in TRY_SLAVES:
             platform_config[slave_platform]['try_slaves'] = sorted(TRY_SLAVES[slave_platform])
@@ -321,18 +280,16 @@ SUITES = {
 
 BRANCH_UNITTEST_VARS = {
     'hghost': 'hg.mozilla.org',
     # turn on platforms as we get them running
     'platforms': {
         'linux': {},
         'linux64': {},
         'linux64-asan': {},
-        'linux64-cc': {},
-        'linux64-tsan': {},
         'macosx64': {},
         'win32': {},
         'win64': {},
     },
 }
 
 ### The below section contains definitions for all of the test suites
 ### available for desktop testing.
@@ -1335,274 +1292,16 @@ PLATFORM_UNITTEST_VARS = {
            'debug_unittest_suites': [],
            'suite_config': {
                'gtest': {
                    'config_files': ["unittests/linux_unittest.py"],
                },
            },
         },
     },
-    'linux64-tsan': {
-        'product_name': 'firefox',
-        'app_name': 'browser',
-        'brand_name': 'Minefield',
-        'builds_before_reboot': 1,
-        'unittest-env': {'DISPLAY': ':0'},
-        'enable_opt_unittests': True,
-        'enable_debug_unittests': False,
-        'ubuntu64_vm': {
-            'opt_unittest_suites': UNITTEST_SUITES['opt_unittest_suites'] + JITTEST_CHUNKED,
-            'debug_unittest_suites': [],
-            'suite_config': {
-                'cppunit': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'jittest': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'marionette': {
-                    'config_files': ["marionette/prod_config.py"],
-                },
-                'marionette-e10s': {
-                    'config_files': ["marionette/prod_config.py"],
-                },
-                'media-tests': {
-                    'config_files': ["mediatests/buildbot_posix_config.py"],
-                },
-                'media-youtube-tests': {
-                    'config_files': ["mediatests/buildbot_posix_config.py"],
-                },
-                'mochitest': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'mochitest-e10s': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'mochitest-a11y': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'mochitest-browser-chrome': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'mochitest-e10s-browser-chrome': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'mochitest-chrome': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'mochitest-devtools-chrome': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'mochitest-e10s-devtools-chrome': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'mochitest-gl': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'mochitest-gl-e10s': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'mochitest-jetpack': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'mochitest-media': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'mochitest-media-e10s': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'mochitest-other': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'mozbase': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'crashtest': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'crashtest-e10s': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'jsreftest': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'jsreftest-e10s': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'reftest': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'reftest-e10s': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'reftest-no-accel': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'reftest-no-accel-e10s': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'web-platform-tests': {
-                    'config_files': ["web_platform_tests/prod_config.py"],
-                },
-                'web-platform-tests-e10s': {
-                    'config_files': ["web_platform_tests/prod_config.py"],
-                },
-                'web-platform-tests-reftests': {
-                    'config_files': ["web_platform_tests/prod_config.py"],
-                },
-                'web-platform-tests-reftests-e10s': {
-                    'config_files': ["web_platform_tests/prod_config.py"],
-                },
-                'webapprt-chrome': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'xpcshell': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-            },
-        },
-        'ubuntu64_vm_lnx_large': {
-           'opt_unittest_suites': [],
-           'debug_unittest_suites': [],
-           'suite_config': {
-               'gtest': {
-                   'config_files': ["unittests/linux_unittest.py"],
-               },
-           },
-        },
-    },
-    'linux64-cc': {
-        'product_name': 'firefox',
-        'app_name': 'browser',
-        'brand_name': 'Minefield',
-        'builds_before_reboot': 1,
-        'unittest-env': {'DISPLAY': ':0'},
-        'enable_opt_unittests': True,
-        'enable_debug_unittests': False,
-        'ubuntu64_vm': {
-            'opt_unittest_suites': UNITTEST_SUITES['opt_unittest_suites'] + JITTEST_CHUNKED,
-            'debug_unittest_suites': [],
-            'suite_config': {
-                'cppunit': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'jittest': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'marionette': {
-                    'config_files': ["marionette/prod_config.py"],
-                },
-                'marionette-e10s': {
-                    'config_files': ["marionette/prod_config.py"],
-                },
-                'media-tests': {
-                    'config_files': ["mediatests/buildbot_posix_config.py"],
-                },
-                'media-youtube-tests': {
-                    'config_files': ["mediatests/buildbot_posix_config.py"],
-                },
-                'mochitest': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'mochitest-e10s': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'mochitest-a11y': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'mochitest-browser-chrome': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'mochitest-e10s-browser-chrome': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'mochitest-chrome': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'mochitest-devtools-chrome': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'mochitest-e10s-devtools-chrome': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'mochitest-gl': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'mochitest-gl-e10s': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'mochitest-jetpack': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'mochitest-media': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'mochitest-media-e10s': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'mochitest-other': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'mozbase': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'crashtest': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'crashtest-e10s': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'jsreftest': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'jsreftest-e10s': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'reftest': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'reftest-e10s': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'reftest-no-accel': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'reftest-no-accel-e10s': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'web-platform-tests': {
-                    'config_files': ["web_platform_tests/prod_config.py"],
-                },
-                'web-platform-tests-e10s': {
-                    'config_files': ["web_platform_tests/prod_config.py"],
-                },
-                'web-platform-tests-reftests': {
-                    'config_files': ["web_platform_tests/prod_config.py"],
-                },
-                'web-platform-tests-reftests-e10s': {
-                    'config_files': ["web_platform_tests/prod_config.py"],
-                },
-                'webapprt-chrome': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-                'xpcshell': {
-                    'config_files': ["unittests/linux_unittest.py"],
-                },
-            },
-        },
-        'ubuntu64_vm_lnx_large': {
-           'opt_unittest_suites': [],
-           'debug_unittest_suites': [],
-           'suite_config': {
-               'gtest': {
-                   'config_files': ["unittests/linux_unittest.py"],
-               },
-           },
-        },
-    },
     'win32': {
         'product_name': 'firefox',
         'app_name': 'browser',
         'brand_name': 'Minefield',
         'builds_before_reboot': 1,
         'mochitest_leak_threshold': 484,
         'crashtest_leak_threshold': 484,
         'env_name': 'win32-perf-unittest',
@@ -3177,19 +2876,16 @@ for branch_name in ('try', 'mozilla-cent
                 continue
             if slave_platform in branch['platforms'][platform]:
                 branch['platforms'][platform][slave_platform]['opt_unittest_suites'] += MOCHITEST_BC_SCREENSHOTS
 
 # Enable gpu/clipboard jobs on all branches v.49+
 for platform in PLATFORMS.keys():
     for name, branch in items_at_least(BRANCHES, 'gecko_version', 49):
         if platform in BRANCHES[name]['platforms']:
-            if (platform in ['linux64-tsan', 'linux64-cc']):
-                continue
-
             for slave_platform in PLATFORMS[platform]['slave_platforms']:
                 # e10s isn't supported on 10.6, so don't schedule tests
                 if slave_platform == "snowleopard":
                     continue
                 if platform in BRANCHES[name]['platforms'] and slave_platform in BRANCHES[name]['platforms'][platform]:
                     BRANCHES[name]['platforms'][platform][slave_platform]['opt_unittest_suites'] += \
                         MOCHITEST_GPU + MOCHITEST_CLIPBOARD
 
@@ -3201,17 +2897,17 @@ for platform in PLATFORMS.keys():
 # Enable talos g4 on 50+
 for name, branch in items_at_least(BRANCHES, 'gecko_version', 50):
     branch['g4_tests'] = (1, False, {}, ALL_TALOS_PLATFORMS)
     branch['g4-e10s_tests'] = (1, False, {}, ALL_TALOS_PLATFORMS)
 
 
 ### Test suites that only run on Try ###
 
-# Enable linux64-cc, linux64-tsan, and win10 on Try only
+# Enable win10 on Try only
 delete_slave_platform(BRANCHES, PLATFORMS, {'win64': 'win10_64'}, branch_exclusions=["try"])
 
 
 ride_trains_branches = []
 for name, branch in items_at_least(BRANCHES, 'gecko_version', 46):
     ride_trains_branches.append(name)
 
 r7_active_branches = []
@@ -3239,44 +2935,39 @@ for branch in BRANCHES.keys():
             tests_key = '%s_tests' % s
             if tests_key in BRANCHES[branch]:
                 tests = list(BRANCHES[branch]['%s_tests' % s])
                 tests[3] = [x for x in tests[3] if x not in platforms_for_os or x in enabled_platforms_for_os]
                 BRANCHES[branch]['%s_tests' % s] = tuple(tests)
 
 # Gtests run from the test package
 for platform in PLATFORMS.keys():
-    if platform not in ['linux', 'linux64', 'linux64-asan', 'linux64-tsan', 'linux64-cc',
-                        'macosx64', 'win32', 'win64']:
+    if platform not in ['linux', 'linux64', 'linux64-asan', 'macosx64', 'win32', 'win64']:
         continue
 
     for name, branch in items_at_least(BRANCHES, 'gecko_version', 46):
         for slave_platform in PLATFORMS[platform]['slave_platforms']:
 
             # Not stable on windows XP
             if slave_platform in ['xp_ix', 'win10_64', 'yosemite']:
                 continue
             # Don't run on win7_vm_gfx
             if slave_platform == 'win7_vm_gfx':
                 continue
 
             if platform in BRANCHES[name]['platforms']:
-                if (platform in ['linux64', 'linux64-tsan', 'linux64-cc'] and slave_platform in ['ubuntu64_vm']) or (platform in ['linux64-asan'] and slave_platform in ['ubuntu64-asan_vm']):
+                if (platform in ['linux64'] and slave_platform in ['ubuntu64_vm']) or (platform in ['linux64-asan'] and slave_platform in ['ubuntu64-asan_vm']):
                     continue
-                elif (platform in ['linux64', 'linux64-tsan', 'linux64-cc'] and slave_platform in ['ubuntu64_vm_lnx_large']) or (platform in ['linux64-asan'] and slave_platform in ['ubuntu64-asan_vm_lnx_large']):
+                elif (platform in ['linux64'] and slave_platform in ['ubuntu64_vm_lnx_large']) or (platform in ['linux64-asan'] and slave_platform in ['ubuntu64-asan_vm_lnx_large']):
                     BRANCHES[name]['platforms'][platform][slave_platform]['debug_unittest_suites'] = GTEST
                     BRANCHES[name]['platforms'][platform][slave_platform]['opt_unittest_suites'] = GTEST
                 else:
                     BRANCHES[name]['platforms'][platform][slave_platform]['debug_unittest_suites'] += GTEST
                     BRANCHES[name]['platforms'][platform][slave_platform]['opt_unittest_suites'] += GTEST
 
-delete_slave_platform(BRANCHES, PLATFORMS, {'linux64-cc': 'ubuntu64_vm'}, branch_exclusions=["try"])
-delete_slave_platform(BRANCHES, PLATFORMS, {'linux64-cc': 'ubuntu64_vm_lnx_large'}, branch_exclusions=["try"])
-delete_slave_platform(BRANCHES, PLATFORMS, {'linux64-tsan': 'ubuntu64_vm' }, branch_exclusions=["try"])
-delete_slave_platform(BRANCHES, PLATFORMS, {'linux64-tsan': 'ubuntu64_vm_lnx_large'}, branch_exclusions=["try"])
 delete_slave_platform(BRANCHES, PLATFORMS, {'linux64-asan': 'ubuntu64_vm'}, branch_exclusions=ride_trains_branches)
 delete_slave_platform(BRANCHES, PLATFORMS, {'linux64-asan': 'ubuntu64-asan_vm_lnx_large'}, branch_exclusions=ride_trains_branches)
 
 # bug 1217534 delete_slave_platform deletes talos too so we need to delete the ubuntu64_vm_lnx_large
 # slave platform a different way otherwise it deletes all talos jobs on linux64 for the non-excluded branches
 for name in BRANCHES.keys():
     if name in ride_trains_branches:
         continue
--- a/mozilla-tests/config_seta.py
+++ b/mozilla-tests/config_seta.py
@@ -19,19 +19,17 @@ seta_platforms = {"Rev4 MacOSX Snow Leop
                   "Windows 7 VM-GFX 32-bit": ("win32", ["win7_vm_gfx"]),
                   "Windows 8 64-bit": ("win64", ["win8_64"]),
                   "Ubuntu VM 12.04": ("linux", ["ubuntu32_vm"]),
                   "Ubuntu VM 12.04 x64": ("linux64", ["ubuntu64_vm"]),
                   "Ubuntu VM large 12.04 x64": ("linux64", ["ubuntu64_vm_lnx_large"]),
                   "Ubuntu HW 12.04 x64": ("linux64", ["ubuntu64_hw"]),
                   "Ubuntu ASAN VM 12.04 x64": ("linux64-asan", ["ubuntu64-asan_vm"]),
                   "Ubuntu ASAN VM large 12.04 x64": ("linux64-asan", ["ubuntu64-asan_vm_lnx_large"]),
-                  "Ubuntu TSAN VM 12.04 x64": ("linux64-tsan", ["ubuntu64_vm", "ubuntu64_vm_lnx_large"]),
                   "Rev7 MacOSX Yosemite 10.10.5": ("macosx64", ["yosemite_r7"]),
-                  "Ubuntu Code Coverage VM 12.04 x64": ("linux64-cc", ["ubuntu64_vm", "ubuntu64_vm_lnx_large"]),
                   "Android 4.3 armv7 API 15+": ("android-api-15", ["ubuntu64_vm_armv7_mobile", "ubuntu64_vm_armv7_large"]),
                   }
 
 # platforms and tests to exclude from configs because they are deprecated or lacking data
 platform_exclusions = []
 test_exclusions = re.compile('\[funsize\]|\[TC\]')
 
 # define seta branches and default values for skipcount and skiptimeout
--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -553,112 +553,16 @@ PLATFORM_VARS = {
                 ('/tools/tooltool.py', '/builds/tooltool.py'),
                 ('/builds/google-oauth-api.key', '/builds/google-oauth-api.key'),
                 ('/builds/relengapi.tok', '/builds/relengapi.tok'),
                 ('/builds/mozilla-desktop-geoloc-api.key', '/builds/mozilla-desktop-geoloc-api.key'),
                 ('/builds/crash-stats-api.token', '/builds/crash-stats-api.token'),
                 ('/usr/local/lib/hgext', '/usr/local/lib/hgext'),
             ],
         },
-        'linux64-tsan': {
-            'mozharness_python': '/tools/buildbot/bin/python',
-            'reboot_command': [
-                '/tools/checkouts/mozharness/external_tools/count_and_reboot.py',
-                '-f', '../reboot_count.txt', '-n', '1', '-z'
-            ],
-            'mozharness_repo_cache': '/tools/checkouts/mozharness',
-            'tools_repo_cache': '/tools/checkouts/build-tools',
-            'mozharness_desktop_build': {
-                'script_name': 'scripts/fx_desktop_build.py',
-                'extra_args': [
-                    '--config', 'builds/releng_base_linux_64_builds.py',
-                    '--custom-build-variant-cfg', 'tsan',
-                    '--config', GLOBAL_VARS['mozharness_configs']['balrog'],
-                ],
-                'script_timeout': 3 * 3600,
-                'script_maxtime': int(5.5 * 3600),
-            },
-
-            'product_name': 'firefox',
-            'unittest_platform': 'linux64-tsan-opt',
-            'app_name': 'browser',
-            'brand_name': 'Minefield',
-            'base_name': 'Linux x86-64 %(branch)s tsan',
-            'mozconfig': 'in_tree',
-            'src_mozconfig': 'browser/config/mozconfigs/linux64/opt-tsan',
-            'profiled_build': False,
-            'builds_before_reboot': localconfig.BUILDS_BEFORE_REBOOT,
-            'build_space': 12,
-            'upload_symbols': False,
-            'try_by_default': False,
-            'download_symbols': False,
-            'packageTests': True,
-            'slaves': SLAVES['mock'],
-            'platform_objdir': OBJDIR,
-            'stage_product': 'firefox',
-            'stage_platform': 'linux64-tsan',
-            'update_platform': 'Linux_x86_64-gcc3',
-            'enable_ccache': True,
-            'enable_shared_checkouts': True,
-            'env': {
-                'DISPLAY': ':2',
-                'HG_SHARE_BASE_DIR': '/builds/hg-shared',
-                'TOOLTOOL_CACHE': '/builds/tooltool_cache',
-                'TOOLTOOL_HOME': '/builds',
-                'MOZ_OBJDIR': OBJDIR,
-                'CCACHE_DIR': '/builds/ccache',
-                'CCACHE_COMPRESS': '1',
-                'CCACHE_UMASK': '002',
-                'LC_ALL': 'C',
-                'PATH': '/tools/buildbot/bin:/usr/local/bin:/usr/lib64/ccache:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/tools/git/bin:/tools/python27/bin:/tools/python27-mercurial/bin:/home/cltbld/bin',
-            },
-            'enable_opt_unittests': True,
-            'enable_checktests': True,
-            'enable_build_analysis': False,
-            'updates_enabled': False,
-            'create_partial': False,
-            'test_pretty_names': False,
-            'l10n_check_test': False,
-            'tooltool_manifest_src': 'browser/config/tooltool-manifests/linux64/tsan.manifest',
-            'tooltool_script': ['/builds/tooltool.py'],
-            'use_mock': True,
-            'mock_target': 'mozilla-centos6-x86_64',
-            'mock_packages': \
-                       ['autoconf213', 'python', 'zip', 'mozilla-python27-mercurial', 'git', 'ccache',
-                        'glibc-static', 'libstdc++-static', 'perl-Test-Simple', 'perl-Config-General',
-                        'gtk2-devel', 'libnotify-devel', 'yasm',
-                        'alsa-lib-devel', 'libcurl-devel',
-                        'wireless-tools-devel', 'libX11-devel',
-                        'libXt-devel', 'mesa-libGL-devel',
-                        'gnome-vfs2-devel', 'GConf2-devel', 'wget',
-                        'mpfr', # required for system compiler
-                        'xorg-x11-font*', # fonts required for PGO
-                        'imake', # required for makedepend!?!
-                        'gcc45_0moz3', 'gcc454_0moz1', 'gcc472_0moz1', 'gcc473_0moz1', 'yasm', 'ccache', # <-- from releng repo
-                        'pulseaudio-libs-devel',
-                        'gstreamer-devel', 'gstreamer-plugins-base-devel',
-                        'freetype-2.3.11-6.el6_1.8.x86_64',
-                        'freetype-devel-2.3.11-6.el6_1.8.x86_64',
-                        ],
-            'mock_copyin_files': [
-                ('/home/cltbld/.ssh', '/home/mock_mozilla/.ssh'),
-                ('/home/cltbld/.hgrc', '/builds/.hgrc'),
-                ('/home/cltbld/.boto', '/builds/.boto'),
-                ('/builds/gapi.data', '/builds/gapi.data'),
-                ('/tools/tooltool.py', '/builds/tooltool.py'),
-                ('/builds/google-oauth-api.key', '/builds/google-oauth-api.key'),
-                ('/builds/relengapi.tok', '/builds/relengapi.tok'),
-                ('/builds/mozilla-desktop-geoloc-api.key', '/builds/mozilla-desktop-geoloc-api.key'),
-                ('/builds/crash-stats-api.token', '/builds/crash-stats-api.token'),
-                ('/usr/local/lib/hgext', '/usr/local/lib/hgext'),
-            ],
-            # The status of this build doesn't affect the last good revision
-            # algorithm for nightlies
-            'consider_for_nightly': False,
-        },
         'linux64-asan-debug': {
             'mozharness_python': '/tools/buildbot/bin/python',
             'reboot_command': [
                 '/tools/checkouts/mozharness/external_tools/count_and_reboot.py',
                 '-f', '../reboot_count.txt', '-n', '1', '-z'
             ],
             'mozharness_repo_cache': '/tools/checkouts/mozharness',
             'tools_repo_cache': '/tools/checkouts/build-tools',
@@ -841,101 +745,16 @@ PLATFORM_VARS = {
                 ('/builds/mozilla-desktop-geoloc-api.key', '/builds/mozilla-desktop-geoloc-api.key'),
                 ('/builds/crash-stats-api.token', '/builds/crash-stats-api.token'),
                 ('/usr/local/lib/hgext', '/usr/local/lib/hgext'),
             ],
             # The status of this build doesn't affect the last good revision
             # algorithm for nightlies
             'consider_for_nightly': False,
         },
-        'linux64-cc': {
-            'mozharness_python': '/tools/buildbot/bin/python',
-            'reboot_command': ['scripts/external_tools/count_and_reboot.py',
-                               '-f', '../reboot_count.txt', '-n', '1', '-z'],
-            'mozharness_desktop_build': {
-                'script_name': 'scripts/fx_desktop_build.py',
-                'extra_args': [
-                    '--config', 'builds/releng_base_linux_64_builds.py',
-                    '--custom-build-variant-cfg', 'code-coverage',
-                    '--config', GLOBAL_VARS['mozharness_configs']['balrog'],
-                ],
-                'script_timeout': 3 * 3600,
-                'script_maxtime': int(5.5 * 3600),
-            },
-            'consider_for_nightly': False,
-            'enable_nightly': False,
-            'enable_opt_unittests': True,
-            'try_by_default': False,
-            'upload_symbols': True,
-            'download_symbols': False,
-            'packageTests': True,
-
-            'product_name': 'firefox',
-            'unittest_platform': 'linux64-cc-opt',
-            'app_name': 'browser',
-            'base_name': 'Linux x86-64 Code Coverage %(branch)s',
-            'mozconfig': 'in_tree',
-            'src_mozconfig': 'browser/config/mozconfigs/linux64/code-coverage',
-            'profiled_build': False,
-            'builds_before_reboot': localconfig.BUILDS_BEFORE_REBOOT,
-            'slaves': SLAVES['mock'],
-            'platform_objdir': OBJDIR,
-            'stage_product': 'firefox',
-            'stage_platform': 'linux64-cc',
-            'update_platform': 'Linux_x86_64-gcc3',
-            'env': {
-                'DISPLAY': ':2',
-                'HG_SHARE_BASE_DIR': '/builds/hg-shared',
-                'TOOLTOOL_CACHE': '/builds/tooltool_cache',
-                'TOOLTOOL_HOME': '/builds',
-                'MOZ_OBJDIR': OBJDIR,
-                'CCACHE_DIR': '/builds/ccache',
-                'CCACHE_COMPRESS': '1',
-                'CCACHE_UMASK': '002',
-                'LC_ALL': 'C',
-                'PATH': '/tools/buildbot/bin:/usr/local/bin:/usr/lib64/ccache:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/tools/git/bin:/tools/python27/bin:/tools/python27-mercurial/bin:/home/cltbld/bin',
-            },
-            'enable_checktests': True,
-            'enable_build_analysis': False,
-            'test_pretty_names': False,
-            'tooltool_manifest_src': 'browser/config/tooltool-manifests/linux64/releng.manifest',
-            'tooltool_script': ['/builds/tooltool.py'],
-            'use_mock': True,
-            'mock_target': 'mozilla-centos6-x86_64',
-            'mock_packages': \
-                       ['autoconf213', 'python', 'zip', 'mozilla-python27-mercurial', 'git', 'ccache',
-                        'glibc-static', 'libstdc++-static', 'perl-Test-Simple', 'perl-Config-General',
-                        'gtk2-devel', 'libnotify-devel', 'yasm',
-                        'alsa-lib-devel', 'libcurl-devel',
-                        'wireless-tools-devel', 'libX11-devel',
-                        'libXt-devel', 'mesa-libGL-devel',
-                        'gnome-vfs2-devel', 'GConf2-devel', 'wget',
-                        'mpfr', # required for system compiler
-                        'xorg-x11-font*', # fonts required for PGO
-                        'imake', # required for makedepend!?!
-                        'gcc45_0moz3', 'gcc454_0moz1', 'gcc472_0moz1', 'gcc473_0moz1', 'yasm', 'ccache', # <-- from releng repo
-                        'dbus-x11',
-                        'pulseaudio-libs-devel',
-                        'gstreamer-devel', 'gstreamer-plugins-base-devel',
-                        'freetype-2.3.11-6.el6_1.8.x86_64',
-                        'freetype-devel-2.3.11-6.el6_1.8.x86_64',
-                        ],
-            'mock_copyin_files': [
-                ('/home/cltbld/.ssh', '/home/mock_mozilla/.ssh'),
-                ('/home/cltbld/.hgrc', '/builds/.hgrc'),
-                ('/home/cltbld/.boto', '/builds/.boto'),
-                ('/builds/gapi.data', '/builds/gapi.data'),
-                ('/tools/tooltool.py', '/builds/tooltool.py'),
-                ('/builds/google-oauth-api.key', '/builds/google-oauth-api.key'),
-                ('/builds/relengapi.tok', '/builds/relengapi.tok'),
-                ('/builds/mozilla-desktop-geoloc-api.key', '/builds/mozilla-desktop-geoloc-api.key'),
-                ('/builds/crash-stats-api.token', '/builds/crash-stats-api.token'),
-                ('/usr/local/lib/hgext', '/usr/local/lib/hgext'),
-            ],
-        },
         'macosx64': {
             'mozharness_python': '/tools/buildbot/bin/python',
             'reboot_command': ['scripts/external_tools/count_and_reboot.py',
                                '-f', '../reboot_count.txt', '-n', '1', '-z'],
             'tools_repo_cache': '/tools/checkouts/build-tools',
             'mozharness_desktop_build': {
                 'script_name': 'scripts/fx_desktop_build.py',
                 'extra_args': [
@@ -2210,18 +2029,16 @@ BRANCHES = {
             'win64-debug': {},
         },
     },
     'try': {
         'branch_projects': ['spidermonkey_try'],
         # The following platforms are not part of the default set,
         # so only run on Try.
         'extra_platforms': {
-            'linux64-cc': {},
-            'linux64-tsan': {},
             'win32-st-an-debug': {},
         },
     },
 }
 
 setMainFirefoxVersions(BRANCHES)
 
 # Copy project branches into BRANCHES keys
@@ -2746,18 +2563,16 @@ BRANCHES['try']['platforms']['win32']['s
 BRANCHES['try']['platforms']['win64']['slaves'] = TRY_SLAVES['win64-rev2']
 BRANCHES['try']['platforms']['win64-debug']['slaves'] = TRY_SLAVES['win64-rev2']
 BRANCHES['try']['platforms']['macosx64']['slaves'] = TRY_SLAVES['macosx64-lion']
 BRANCHES['try']['platforms']['linux-debug']['slaves'] = TRY_SLAVES['mock']
 BRANCHES['try']['platforms']['linux64-debug']['slaves'] = TRY_SLAVES['mock']
 BRANCHES['try']['platforms']['linux64-asan']['slaves'] = TRY_SLAVES['mock']
 BRANCHES['try']['platforms']['linux64-asan-debug']['slaves'] = TRY_SLAVES['mock']
 BRANCHES['try']['platforms']['linux64-st-an-debug']['slaves'] = TRY_SLAVES['mock']
-BRANCHES['try']['platforms']['linux64-tsan']['slaves'] = TRY_SLAVES['mock']
-BRANCHES['try']['platforms']['linux64-cc']['slaves'] = TRY_SLAVES['mock']
 BRANCHES['try']['platforms']['win32-debug']['slaves'] = TRY_SLAVES['win64-rev2']
 BRANCHES['try']['platforms']['win32-st-an-debug']['slaves'] = TRY_SLAVES['win64-rev2']
 BRANCHES['try']['platforms']['macosx64-debug']['slaves'] = TRY_SLAVES['macosx64-lion']
 BRANCHES['try']['platforms']['macosx64-st-an-debug']['slaves'] = TRY_SLAVES['macosx64-lion']
 BRANCHES['try']['platforms']['android-api-15']['slaves'] = TRY_SLAVES['mock']
 BRANCHES['try']['platforms']['android-api-15-debug']['slaves'] = TRY_SLAVES['mock']
 BRANCHES['try']['platforms']['android-x86']['slaves'] = TRY_SLAVES['mock']
 for platform in BRANCHES['try']['platforms'].keys():