bug 812512 - kill leopard. r=aki
authorArmen Zambrano Gasparnian <armenzg@mozilla.com>
Tue, 19 Feb 2013 17:11:20 -0800
changeset 7907 a6380dbe3c6726b690f602007efc00ac87b4623b
parent 7906 27d82031f225076104bb5c873490a8d18ed7c545
child 7912 065e7627f0a5ae299d23900d8743a31b7cbc5966
child 7913 76d828a9bb4ac47d22e92981d146c431ea5c90a5
push id1
push userroot
push dateWed, 17 Dec 2014 00:18:48 +0000
reviewersaki
bugs812512
bug 812512 - kill leopard. r=aki
mozilla-tests/BuildSlaves.py.template
mozilla-tests/b2g_config.py
mozilla-tests/config.py
mozilla-tests/mobile_config.py
mozilla-tests/production_config.py
mozilla-tests/staging_config.py
mozilla-tests/thunderbird_config.py
mozilla/BuildSlaves.py.template
mozilla/production_config.py
mozilla/staging_config.py
mozilla/thunderbird_production_config.py
mozilla2/macosx/electrolysis/debug/mozconfig
mozilla2/macosx/electrolysis/nightly/mozconfig
mozilla2/macosx/electrolysis/release/mozconfig
mozilla2/macosx/electrolysis/xulrunner/mozconfig
mozilla2/macosx/generic/debug/mozconfig
mozilla2/macosx/generic/nightly/mozconfig
mozilla2/macosx/jaegermonkey/debug/mozconfig
mozilla2/macosx/jaegermonkey/nightly/mozconfig
mozilla2/macosx/mozilla-aurora/debug/mozconfig
mozilla2/macosx/mozilla-aurora/nightly/mozconfig
mozilla2/macosx/mozilla-aurora/release/mozconfig
mozilla2/macosx/mozilla-aurora/xulrunner/mozconfig
mozilla2/macosx/mozilla-beta/debug/mozconfig
mozilla2/macosx/mozilla-beta/nightly/mozconfig
mozilla2/macosx/mozilla-beta/release/mozconfig
mozilla2/macosx/mozilla-beta/xulrunner/mozconfig
mozilla2/macosx/mozilla-central/debug/mozconfig
mozilla2/macosx/mozilla-central/nightly/mozconfig
mozilla2/macosx/mozilla-central/release/mozconfig
mozilla2/macosx/mozilla-central/xulrunner/mozconfig
mozilla2/macosx/mozilla-release/debug/mozconfig
mozilla2/macosx/places/debug/mozconfig
mozilla2/macosx/places/nightly/mozconfig
mozilla2/macosx/places/release/mozconfig
mozilla2/macosx/places/xulrunner/mozconfig
mozilla2/macosx/try/debug/mozconfig
mozilla2/macosx/try/nightly/mozconfig
mozilla2/macosx/ux/debug/mozconfig
mozilla2/macosx/ux/nightly/mozconfig
simple-talos/config.py
--- a/mozilla-tests/BuildSlaves.py.template
+++ b/mozilla-tests/BuildSlaves.py.template
@@ -1,16 +1,14 @@
 SlavePasswords = {
     "linux": "pass",
     "linux64": "pass",
     "fedora": "pass",
     "fedora64": "pass",
     "tiger": "pass",
-    "leopard": "pass",
-    "leopard-o": "pass",
     "snowleopard": "pass",
     "lion": "pass",
     "mountainlion": "pass",
     "xp": "pass",
     "win7": "pass",
     "w764": "pass",
     "vista": "pass",
     "tegra_android": "pass",
--- a/mozilla-tests/b2g_config.py
+++ b/mozilla-tests/b2g_config.py
@@ -73,18 +73,17 @@ PLATFORMS['b2g_panda_gaia_central']['moz
     'mozharness_python': '/tools/buildbot/bin/python',
     'use_mozharness': True,
     # path to hg on the foopies
     'hg_bin': '/usr/local/bin/hg',
     # TODO: call something else
     'reboot_command': None,
 }
 
-# Lets be explicit instead of magical.  leopard-o should be a second
-# entry in the SLAVE dict
+# Lets be explicit instead of magical.
 for platform, platform_config in PLATFORMS.items():
     for slave_platform in platform_config['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])
         else:
             platform_config[slave_platform]['try_slaves'] = platform_config[slave_platform]['slaves']
 
--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -24,17 +24,16 @@ TALOS_TP_NEW_OPTS = {'plugins': {'32': '
 BRANCHES = {
     'mozilla-central':     {},
     'mozilla-aurora':      {},
     'mozilla-release':     {},
     'mozilla-beta':        {},
     'mozilla-esr17':       {
         'datazilla_url': None,
         'platforms': {
-            'macosx': {},
             'macosx64': {},
             'win32': {},
             'linux': {},
             'linux64': {},
         },
         'lock_platforms': True,
     },
     'mozilla-b2g18': {
@@ -70,38 +69,24 @@ BRANCHES = {
         },
         'lock_platforms': True,
     },
     'try': {'coallesce_jobs': False},
 }
 
 # Talos
 PLATFORMS = {
-    'macosx': {},
     'macosx64': {},
     'win32': {},
     'linux': {},
     'linux64': {},
 }
 
-# work around path length problem bug 599795
-# leopard-o == leopard-old
-PLATFORMS['macosx']['slave_platforms'] = ['leopard-o']
-PLATFORMS['macosx']['env_name'] = 'mac-perf'
-PLATFORMS['macosx']['leopard-o'] = {'name': "Rev3 MacOSX Leopard 10.5.8"}
-PLATFORMS['macosx']['stage_product'] = 'firefox'
-PLATFORMS['macosx']['mozharness_config'] = {
-    'mozharness_python': '/tools/buildbot/bin/python',
-    'hg_bin': 'hg',
-    'reboot_command': ['/tools/buildbot/bin/python'] + MOZHARNESS_REBOOT_CMD}
-
-PLATFORMS['macosx64']['slave_platforms'] = ['leopard', 'snowleopard',
-                                            'lion', 'mountainlion']
+PLATFORMS['macosx64']['slave_platforms'] = ['snowleopard', 'lion', 'mountainlion']
 PLATFORMS['macosx64']['env_name'] = 'mac-perf'
-PLATFORMS['macosx64']['leopard'] = {'name': "Rev3 MacOSX Leopard 10.5.8"}
 PLATFORMS['macosx64']['snowleopard'] = {'name': "Rev4 MacOSX Snow Leopard 10.6"}
 PLATFORMS['macosx64']['lion'] = {'name': "Rev4 MacOSX Lion 10.7"}
 PLATFORMS['macosx64']['mountainlion'] = {'name': "Rev5 MacOSX Mountain Lion 10.8"}
 PLATFORMS['macosx64']['stage_product'] = 'firefox'
 PLATFORMS['macosx64']['mozharness_config'] = {
     'mozharness_python': '/tools/buildbot/bin/python',
     'hg_bin': 'hg',
     'reboot_command': ['/tools/buildbot/bin/python'] + MOZHARNESS_REBOOT_CMD,
@@ -135,18 +120,17 @@ PLATFORMS['linux64']['fedora64'] = {'nam
 PLATFORMS['linux64']['ubuntu64'] = {'name': 'Ubuntu 12.04 x64'}
 PLATFORMS['linux64']['stage_product'] = 'firefox'
 PLATFORMS['linux64']['mozharness_config'] = {
     'mozharness_python': '/tools/buildbot/bin/python',
     'hg_bin': 'hg',
     'reboot_command': ['/tools/buildbot/bin/python'] + MOZHARNESS_REBOOT_CMD,
 }
 
-# Lets be explicit instead of magical.  leopard-o should be a second
-# entry in the SLAVE dict
+# Lets be explicit instead of magical.
 for platform, platform_config in PLATFORMS.items():
     for slave_platform in platform_config['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])
         else:
             platform_config[slave_platform]['try_slaves'] = platform_config[slave_platform]['slaves']
 
@@ -275,17 +259,16 @@ SUITES = {
 }
 
 BRANCH_UNITTEST_VARS = {
     'hghost': 'hg.mozilla.org',
     # turn on platforms as we get them running
     'platforms': {
         'linux': {},
         'linux64': {},
-        'macosx': {},
         'macosx64': {},
         'win32': {},
     },
 }
 
 # Default set of unit tests
 UNITTEST_SUITES = {
     'opt_unittest_suites': [
@@ -406,39 +389,23 @@ PLATFORM_UNITTEST_VARS = {
             'debug_unittest_suites': UNITTEST_SUITES['debug_unittest_suites'][:],
         },
         'win7': {
             'opt_unittest_suites': UNITTEST_SUITES['opt_unittest_suites'][:] +
             [('reftest-no-accel', ['reftest-no-d2d-d3d'])],
             'debug_unittest_suites': UNITTEST_SUITES['debug_unittest_suites'][:],
         }
     },
-    'macosx': {
-        'product_name': 'firefox',
-        'app_name': 'browser',
-        'brand_name': 'Minefield',
-        'builds_before_reboot': 1,
-        'enable_opt_unittests': True,
-        'enable_debug_unittests': True,
-        'leopard-o': {
-            'opt_unittest_suites': [],
-            'debug_unittest_suites': removeSuite('mochitest-a11y', UNITTEST_SUITES['debug_unittest_suites'][:]),
-        },
-    },
     'macosx64': {
         'product_name': 'firefox',
         'app_name': 'browser',
         'brand_name': 'Minefield',
         'builds_before_reboot': 1,
         'enable_opt_unittests': True,
         'enable_debug_unittests': True,
-        'leopard': {
-            'opt_unittest_suites': removeSuite('mochitest-a11y', UNITTEST_SUITES['opt_unittest_suites'][:]),
-            'debug_unittest_suites': [],
-        },
         'snowleopard': {
             'opt_unittest_suites': removeSuite('mochitest-a11y', UNITTEST_SUITES['opt_unittest_suites'][:]),
             'debug_unittest_suites': removeSuite('mochitest-a11y', UNITTEST_SUITES['debug_unittest_suites'][:]),
         },
         'lion': {
             'opt_unittest_suites': removeSuite('mochitest-a11y', UNITTEST_SUITES['opt_unittest_suites'][:]),
             'debug_unittest_suites': removeSuite('mochitest-a11y', UNITTEST_SUITES['debug_unittest_suites'][:]),
         },
@@ -614,42 +581,30 @@ BRANCHES['mozilla-b2g18_v1_0_1']['pgo_st
 BRANCHES['try']['xperf_tests'] = (1, False, TALOS_TP_NEW_OPTS, WIN7_ONLY)
 BRANCHES['try']['pgo_strategy'] = 'try'
 BRANCHES['try']['enable_try'] = True
 
 # Let's load jetpack for the following branches:
 for branch in ('mozilla-central', 'mozilla-aurora', 'try', 'mozilla-inbound', 'ionmonkey', ):
     for pf in PLATFORMS:
         for slave_pf in PLATFORMS[pf]['slave_platforms']:
-            # These two mac exceptions are because we have been adding debug jetpack to macosx/leopard-o
-            # and opt jetpack to macosx64/leopard. This probably was not correct but that's how it came about
-            # XXX clean this mess in the next refactoring patch
-            if pf == "macosx" and slave_pf == "leopard-o":
-                BRANCHES[branch]['platforms'][pf][slave_pf]['debug_unittest_suites'] += [('jetpack', ['jetpack'])]
-                continue
-            if pf == "macosx64" and slave_pf == "leopard":
-                BRANCHES[branch]['platforms'][pf][slave_pf]['opt_unittest_suites'] += [('jetpack', ['jetpack'])]
-                continue
             BRANCHES[branch]['platforms'][pf][slave_pf]['opt_unittest_suites'] += [('jetpack', ['jetpack'])]
             BRANCHES[branch]['platforms'][pf][slave_pf]['debug_unittest_suites'] += [('jetpack', ['jetpack'])]
 
 
 # Let's load Marionette for the following branches:
 for branch in ('mozilla-central', 'mozilla-inbound', 'try', 'fx-team', 'services-central', ):
     for pf in PLATFORMS:
         config_file = "marionette/prod_config.py"
         if pf.startswith('win'):
             if branch != 'try':
                 # for now, only run windows tests on try because of bug 795513
                 continue
             config_file = "marionette/windows_config.py"
         for slave_pf in PLATFORMS[pf]['slave_platforms']:
-            if pf == "macosx" and slave_pf in ("leopard-o", "leopard"):
-                # we don't run on OSX 10.5
-                continue
             # Marionette is only enabled on debug builds
             BRANCHES[branch]['platforms'][pf][slave_pf]['debug_unittest_suites'] += [(
                 'marionette',
                 {'suite': 'marionette',
                  'script_path': 'scripts/marionette.py',
                  'use_mozharness': True,
                  'extra_args': [
                      "--cfg", config_file
@@ -684,18 +639,16 @@ for branch in BRANCHES:
             hg_bin = 'hg'
             if pf.startswith("win"):
                 config_file = "unittests/win_unittest.py"
             elif pf.startswith("mac"):
                 config_file = "unittests/mac_unittest.py"
             else:
                 config_file = "unittests/linux_unittest.py"
             for slave_pf in PLATFORMS[pf]['slave_platforms']:
-                if pf == "macosx" and slave_pf == "leopard-o":
-                    continue
                 for testtype in ("opt", "debug"):
                     if not BRANCHES[branch]['platforms'][pf][slave_pf]['%s_unittest_suites' % testtype]:
                         continue
                     BRANCHES[branch]['platforms'][pf][slave_pf]['%s_unittest_suites' % testtype] = []
                     for suite in mozharness_unittest_suites:
                         if 'platforms' in suite and pf not in suite['platforms']:
                             continue
                         if 'test_types' in suite and testtype not in suite['test_types']:
@@ -722,28 +675,16 @@ for branch in BRANCHES:
 ###################### END OF MOZHARNESS UNITTEST CONFIGS
 
 ######## generic branch variables for project branches
 for projectBranch in ACTIVE_PROJECT_BRANCHES:
     branchConfig = PROJECT_BRANCHES[projectBranch]
     loadDefaultValues(BRANCHES, projectBranch, branchConfig)
     loadCustomTalosSuites(BRANCHES, SUITES, projectBranch, branchConfig)
 
-#-------------------------------------------------------------------------
-# Remove leopard when esr10 goes away
-#-------------------------------------------------------------------------
-for branch in BRANCHES.keys():
-    if 'macosx' in BRANCHES[branch]['platforms']:
-        del BRANCHES[branch]['platforms']['macosx']
-    if 'macosx64' in BRANCHES[branch]['platforms']:
-        del BRANCHES[branch]['platforms']['macosx64']['leopard']
-        BRANCHES[branch]['platforms']['macosx64']['slave_platforms'] = ['snowleopard', 'lion', 'mountainlion']
-#-------------------------------------------------------------------------
-# End disable leopard tests for FF17 onwards
-#-------------------------------------------------------------------------
 
 # MERGE DAY NOTE: remove v21 based branches from the list below
 NON_UBUNTU_BRANCHES = ("mozilla-beta", "mozilla-release", "mozilla-esr17",
                        "mozilla-b2g18", "mozilla-b2g18_v1_0_0", "mozilla-b2g18_v1_0_1")
 # Green tests, including mozharness based ones
 # Tests listed as Ubuntu tests won't be enabled on Fedora
 UBUNTU_OPT_UNITTEST = ["crashtest", "jsreftest", "jetpack", "crashtest-ipc",
                        "reftest-ipc"]
--- a/mozilla-tests/mobile_config.py
+++ b/mozilla-tests/mobile_config.py
@@ -94,18 +94,17 @@ PLATFORMS['android-armv6']['mozharness_c
 PLATFORMS['android-noion']['slave_platforms'] = ['tegra_android-noion']
 PLATFORMS['android-noion']['env_name'] = 'android-perf'
 PLATFORMS['android-noion']['is_mobile'] = True
 PLATFORMS['android-noion']['tegra_android-noion'] = {'name': "Android no-ionmonkey Tegra 250"}
 PLATFORMS['android-noion']['stage_product'] = 'mobile'
 PLATFORMS['android-noion']['mozharness_python'] = '/tools/buildbot/bin/python'
 
 
-# Lets be explicit instead of magical.  leopard-o should be a second
-# entry in the SLAVE dict
+# Lets be explicit instead of magical.
 for platform, platform_config in PLATFORMS.items():
     for slave_platform in platform_config['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])
         else:
             platform_config[slave_platform]['try_slaves'] = platform_config[slave_platform]['slaves']
 
--- a/mozilla-tests/production_config.py
+++ b/mozilla-tests/production_config.py
@@ -1,33 +1,30 @@
 SLAVES = {
     'fedora': dict([("talos-r3-fed-%03i" % x, {}) for x in range(3,10) + range(11,18) + range(19,59) + range(60,87)]),
     'fedora64' : dict([("talos-r3-fed64-%03i" % x, {}) for x in range (3,10) + range(11,35) + range(36,72)]),
     'xp': dict([("talos-r3-xp-%03i" % x, {}) for x in range(4,10) + range(11,101) \
           if x not in [45, 58, 59]]), # bug 661377, bug 780515, bug 753357
     'win7': dict([("talos-r3-w7-%03i" % x, {}) for x in range(4,10) + range(11,17) + range(18,105)]),
-    'leopard': dict([("talos-r3-leopard-%03i" % x, {}) for x in range(3,10) + range(11,27) \
-          if x not in [7]]), # bug 655437
     'snowleopard': dict([("talos-r4-snow-%03i" % x, {}) for x in range(4,10) + range(11,81) + [82,84]]),
     'lion': dict([("talos-r4-lion-%03i" % x, {}) for x in range(4,10) + range(11,58) + range(59,83) + [84]]),
     'mountainlion': dict([("talos-mtnlion-r5-%03i" % x, {}) for x in range(4,10) + range(11,90)]),
     'tegra_android': dict([('tegra-%03i' % x, {'http_port': '30%03i' % x, 'ssl_port': '31%03i' % x}) \
         for x in range(31,371) \
         if x not in range(122,129) + [30,33,34,43,44,49,65,69,77,131,137,143,147,\
             153,156,161,175,176,180,184,185,186,193,197,198,202,203,204,205,222,224,\
             226,241,268,275,289,291,292,301]]), # decommissioned tegras
     'panda_android': dict(
         [('panda-%04i' % x, {'http_port': '30%03i' % x, 'ssl_port': '31%03i' % x}) for x in range(22,82) + range(522,874) + range(885,887)]
     ),
     'b2g_panda': dict([("panda-%04i" % x, {}) for x in range(82,522)]),
     'ubuntu32': dict([("tst-linux32-ec2-%03i" % x, {}) for x in range(1, 150) + range(300, 450)]),
     'ubuntu64': dict([("tst-linux64-ec2-%03i" % x, {}) for x in range(1, 150) + range(300, 450)]),
 }
 
-SLAVES['leopard-o'] = SLAVES['leopard']
 SLAVES['tegra_android-armv6'] = SLAVES['tegra_android']
 SLAVES['tegra_android-noion'] = SLAVES['tegra_android']
 SLAVES['fedora-b2g'] = SLAVES['fedora']
 SLAVES['ubuntu32-b2g'] = SLAVES['ubuntu32']
 SLAVES['b2g_panda_gaia_central'] = SLAVES['b2g_panda']
 
 TRY_SLAVES = {}
 
--- a/mozilla-tests/staging_config.py
+++ b/mozilla-tests/staging_config.py
@@ -1,30 +1,28 @@
 from copy import deepcopy
 import production_config as pc
 
 STAGING_SLAVES = {
     'fedora': dict([("talos-r3-fed-%03i" % x, {}) for x in [1, 2, 10]]),
     'fedora64': dict([("talos-r3-fed64-%03i" % x, {}) for x in [1, 2, 10]]),
     'xp': dict([("talos-r3-xp-%03i" % x, {}) for x in [1, 2, 3, 10]]),
     'win7': dict([("talos-r3-w7-%03i" % x, {}) for x in [1, 2, 3, 10]]),
-    'leopard': dict([("talos-r3-leopard-%03i" % x, {}) for x in [1, 2, 10]]),
     'snowleopard': dict([("talos-r4-snow-%03i" % x, {}) for x in [1, 2, 3, 10]]),
     'lion': dict([("talos-r4-lion-%03i" % x, {}) for x in [1, 2, 3, 10]]),
     'mountainlion': dict([("talos-mtnlion-r5-%03i" % x, {}) for x in [1, 2, 3, 10]]),
     'tegra_android': dict(
         [('tegra-%03i' % x, {'http_port': '30%03i' % x, 'ssl_port': '31%03i' % x}) for x in range(10,30)]
     ),
     'panda_android': dict(),
     'b2g_panda': dict(),
     'ubuntu32': dict(),
     'ubuntu64': dict(),
 }
 
-STAGING_SLAVES['leopard-o'] = STAGING_SLAVES['leopard']
 STAGING_SLAVES['tegra_android-armv6'] = STAGING_SLAVES['tegra_android']
 STAGING_SLAVES['tegra_android-noion'] = STAGING_SLAVES['tegra_android']
 STAGING_SLAVES['fedora-b2g'] = STAGING_SLAVES['fedora']
 
 SLAVES = deepcopy(STAGING_SLAVES)
 
 for p, slaves in pc.SLAVES.items() + pc.TRY_SLAVES.items():
     if p not in SLAVES:
--- a/mozilla-tests/thunderbird_config.py
+++ b/mozilla-tests/thunderbird_config.py
@@ -24,37 +24,26 @@ BRANCHES = {
     'comm-esr17': {
     },
     'try-comm-central': {
         'coallesce_jobs': False
     },
 }
 
 PLATFORMS = {
-    'macosx': {},
     'macosx64': {},
     'win32': {},
     'linux': {},
     'linux64': {},
 }
 
 builder_prefix = "TB "
 
-# work around path length problem bug 599795
-# leopard-o == leopard-old
-PLATFORMS['macosx']['slave_platforms'] = ['leopard-o']
-PLATFORMS['macosx']['env_name'] = 'mac-perf'
-PLATFORMS['macosx']['leopard-o'] = {'name': builder_prefix + "Rev3 MacOSX Leopard 10.5.8"}
-PLATFORMS['macosx']['stage_product'] = 'thunderbird'
-PLATFORMS['macosx']['mozharness_python'] = '/tools/buildbot/bin/python'
-
-PLATFORMS['macosx64']['slave_platforms'] = ['leopard', 'snowleopard',
-                                            'lion', 'mountainlion']
+PLATFORMS['macosx64']['slave_platforms'] = ['snowleopard', 'lion', 'mountainlion']
 PLATFORMS['macosx64']['env_name'] = 'mac-perf'
-PLATFORMS['macosx64']['leopard'] = {'name': builder_prefix + "Rev3 MacOSX Leopard 10.5.8"}
 PLATFORMS['macosx64']['snowleopard'] = {'name': builder_prefix + "Rev4 MacOSX Snow Leopard 10.6"}
 PLATFORMS['macosx64']['lion'] = {'name': builder_prefix + "Rev4 MacOSX Lion 10.7"}
 PLATFORMS['macosx64']['mountainlion'] = {'name': builder_prefix + "Rev5 MacOSX Mountain Lion 10.8"}
 PLATFORMS['macosx64']['stage_product'] = 'thunderbird'
 PLATFORMS['macosx64']['mozharness_python'] = '/tools/buildbot/bin/python'
 
 PLATFORMS['win32']['slave_platforms'] = ['xp', 'win7']
 PLATFORMS['win32']['env_name'] = 'win32-perf'
@@ -70,18 +59,17 @@ PLATFORMS['linux']['stage_product'] = 't
 PLATFORMS['linux']['mozharness_python'] = '/tools/buildbot/bin/python'
 
 PLATFORMS['linux64']['slave_platforms'] = ['fedora64']
 PLATFORMS['linux64']['env_name'] = 'linux-perf'
 PLATFORMS['linux64']['fedora64'] = {'name': builder_prefix + "Rev3 Fedora 12x64"}
 PLATFORMS['linux64']['stage_product'] = 'thunderbird'
 PLATFORMS['linux64']['mozharness_python'] = '/tools/buildbot/bin/python'
 
-# Lets be explicit instead of magical.  leopard-o should be a second
-# entry in the SLAVE dict
+# Lets be explicit instead of magical.
 for platform, platform_config in PLATFORMS.items():
     for slave_platform in platform_config['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])
         else:
             platform_config[slave_platform]['try_slaves'] = platform_config[slave_platform]['slaves']
 
@@ -105,17 +93,16 @@ MAC_ONLY = PLATFORMS['macosx64']['slave_
 SUITES = {}
 
 BRANCH_UNITTEST_VARS = {
     'hghost': 'hg.mozilla.org',
     # turn on platforms as we get them running
     'platforms': {
         'linux': {},
         'linux64': {},
-        'macosx': {},
         'macosx64': {},
         'win32': {},
     },
 }
 
 # Default set of unit tests
 UNITTEST_SUITES = {
     'opt_unittest_suites': [
@@ -172,39 +159,23 @@ PLATFORM_UNITTEST_VARS = {
             'opt_unittest_suites': UNITTEST_SUITES['opt_unittest_suites'][:],
             'debug_unittest_suites': UNITTEST_SUITES['debug_unittest_suites'][:],
         },
         'win7': {
             'opt_unittest_suites': UNITTEST_SUITES['opt_unittest_suites'][:],
             'debug_unittest_suites': UNITTEST_SUITES['debug_unittest_suites'][:],
         },
     },
-    'macosx': {
-        'product_name': 'thunderbird',
-        'app_name': 'mail',
-        'brand_name': 'Daily',
-        'builds_before_reboot': 1,
-        'enable_opt_unittests': True,
-        'enable_debug_unittests': True,
-        'leopard-o': {
-            'opt_unittest_suites': [],
-            'debug_unittest_suites': UNITTEST_SUITES['debug_unittest_suites'][:],
-        },
-    },
     'macosx64': {
         'product_name': 'thunderbird',
         'app_name': 'mail',
         'brand_name': 'Daily',
         'builds_before_reboot': 1,
         'enable_opt_unittests': True,
         'enable_debug_unittests': True,
-        'leopard': {
-            'opt_unittest_suites': UNITTEST_SUITES['opt_unittest_suites'][:],
-            'debug_unittest_suites': [],
-        },
         'snowleopard': {
             'opt_unittest_suites': UNITTEST_SUITES['opt_unittest_suites'][:],
             'debug_unittest_suites': UNITTEST_SUITES['debug_unittest_suites'][:],
         },
         'lion': {
             'opt_unittest_suites': UNITTEST_SUITES['opt_unittest_suites'][:],
             'debug_unittest_suites': UNITTEST_SUITES['debug_unittest_suites'][:],
         },
@@ -316,29 +287,16 @@ BRANCHES['comm-aurora']['repo_path'] = "
 
 ######## comm-esr17
 BRANCHES['comm-esr17']['pgo_strategy'] = None
 BRANCHES['comm-esr17']['repo_path'] = "releases/comm-esr17"
 
 ######## try
 BRANCHES['try-comm-central']['enable_try'] = True
 
-#-------------------------------------------------------------------------
-# MERGE day - disable leopard tests for TB17 onwards
-#-------------------------------------------------------------------------
-for branch in ['comm-central', 'try-comm-central', 'comm-aurora', 'comm-beta', 'comm-release', 'comm-esr17']:
-    if 'macosx' in BRANCHES[branch]['platforms']:
-        del BRANCHES[branch]['platforms']['macosx']
-    if 'macosx64' in BRANCHES[branch]['platforms']:
-        del BRANCHES[branch]['platforms']['macosx64']['leopard']
-        BRANCHES[branch]['platforms']['macosx64']['slave_platforms'] = ['snowleopard', 'lion', 'mountainlion']
-#-------------------------------------------------------------------------
-# End disable leopard tests for TB17 onwards
-#-------------------------------------------------------------------------
-
 if __name__ == "__main__":
     import sys
     import pprint
 
     args = sys.argv[1:]
 
     if len(args) > 0:
         items = dict([(b, BRANCHES[b]) for b in args])
--- a/mozilla/BuildSlaves.py.template
+++ b/mozilla/BuildSlaves.py.template
@@ -1,19 +1,17 @@
 SlavePasswords = {
         'linux': 'pass',
         'try-linux': 'pass',
         'linux64': 'pass',
         'win32': 'pass',
         'win64': 'pass',
         'try-win32': 'pass',
-        'macosx': 'pass',
         'macosx64': 'pass',
         'macosx64-lion': 'pass',
-        'try-macosx': 'pass',
         'android': 'pass',
         'android-armv6': 'pass',
         'android-noion': 'pass',
         'android-x86': 'pass',
         'mock': 'pass',
         'b2g_panda': 'pass',
         }
 tuxedoUsername = 'user'
--- a/mozilla/production_config.py
+++ b/mozilla/production_config.py
@@ -11,17 +11,16 @@ WIN64_IXS      = ['w64-ix-slave%02i' % x
 MOCK_DL120G7   = ['bld-centos6-hp-%03d' % x for x in range(6,24)] # 5 staging, 17 prod, 17 try
 LINUX64_EC2    = ['bld-linux64-ec2-%03d' % x for x in range(1, 101) + range(300, 401) + range(600, 701)]
 
 SLAVES = {
     'linux':            LINUX_VMS + LINUX_IXS,
     'linux64':          LINUX64_VMS + LINUX64_IXS,
     'win32':            WIN32_IXS,
     'win64':            WIN64_IXS,
-    'macosx':           [],
     'macosx64':         MAC_SNOW_MINIS,
     'macosx64-lion':    MAC_LION_MINIS,
     'android':          LINUX_VMS + LINUX_IXS,
     'android-armv6':    LINUX_VMS + LINUX_IXS,
     'android-x86':      MOCK_DL120G7 + LINUX64_EC2,
     'mock':             MOCK_DL120G7 + LINUX64_EC2,
 }
 
--- a/mozilla/staging_config.py
+++ b/mozilla/staging_config.py
@@ -11,17 +11,16 @@ WIN64_IXS      = ['w64-ix-slave%02i' % x
 MOCK_DL120G7   = ['bld-centos6-hp-%03d' % x for x in range(1, 6)]
 LINUX64_EC2    = ['dev-linux64-ec2-%03d' % x for x in range(1, 50)]
 
 STAGING_SLAVES = {
     'linux':            LINUX_IXS,
     'linux64':          LINUX64_IXS,
     'win32':            WIN32_IXS,
     'win64':            WIN64_IXS,
-    'macosx':           [],
     'macosx64':         MAC_SNOW_MINIS,
     'macosx64-lion':    MAC_LION_MINIS,
     'android':          LINUX_IXS,
     'android-armv6':    LINUX_IXS,
     'android-x86':      MOCK_DL120G7,
     'mock':             MOCK_DL120G7 + LINUX64_EC2,
 }
 
--- a/mozilla/thunderbird_production_config.py
+++ b/mozilla/thunderbird_production_config.py
@@ -11,17 +11,16 @@ from localconfig import \
 
 GLOBAL_VARS = deepcopy(GLOBAL_VARS)
 
 SLAVES = {
     'linux':            LINUX_VMS + LINUX_IXS,
     'linux64':          LINUX64_VMS + LINUX64_IXS,
     'win32':            WIN32_IXS,
     'win64':            WIN64_IXS,
-    'macosx':           [],
     'macosx64':         MAC_SNOW_MINIS,
     'macosx64-lion':    MAC_LION_MINIS,
     'mock':             MOCK_DL120G7
 }
 
 TRY_SLAVES = {
     'linux':       TRY_LINUX + TRY_LINUX_IXS,
     'linux64':     TRY_LINUX64 + TRY_LINUX64_IXS,
deleted file mode 100644
--- a/mozilla2/macosx/electrolysis/debug/mozconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-# Don't use the standard mozconfig. We don't want universal for a debug build. 
-#. $topsrcdir/build/macosx/universal/mozconfig
-
-ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk
-
-ac_add_options --disable-optimize
-ac_add_options --enable-debug
-ac_add_options --enable-libxul
-
-ac_add_options --enable-application=browser
-ac_add_options --enable-tests
-ac_add_options --enable-trace-malloc
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/macosx/electrolysis/nightly/mozconfig
+++ /dev/null
@@ -1,20 +0,0 @@
-. $topsrcdir/build/macosx/universal/mozconfig
-
-ac_add_options --enable-application=browser
-ac_add_options --enable-update-channel=nightly-electrolysis
-ac_add_options --enable-update-packaging
-ac_add_options --enable-tests
-ac_add_options --disable-install-strip
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
deleted file mode 100644
--- a/mozilla2/macosx/electrolysis/release/mozconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-. $topsrcdir/build/macosx/universal/mozconfig
-
-ac_add_options --enable-application=browser
-ac_add_options --enable-update-channel=beta
-ac_add_options --enable-update-packaging
-ac_add_options --enable-tests
-ac_add_options --enable-official-branding
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-export MOZ_TELEMETRY_REPORTING=1
deleted file mode 100644
--- a/mozilla2/macosx/electrolysis/xulrunner/mozconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-. $topsrcdir/build/macosx/universal/mozconfig
-
-export MOZILLA_OFFICIAL=1
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-ac_add_options --enable-application=xulrunner
-ac_add_options --disable-tests
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
deleted file mode 100644
--- a/mozilla2/macosx/generic/debug/mozconfig
+++ /dev/null
@@ -1,28 +0,0 @@
-# Don't use the standard mozconfig. We don't want universal for a debug build. 
-#. $topsrcdir/build/macosx/universal/mozconfig
-
-ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk
-
-ac_add_options --disable-optimize
-ac_add_options --enable-debug
-ac_add_options --enable-libxul
-
-ac_add_options --enable-application=browser
-ac_add_options --enable-tests
-ac_add_options --enable-trace-malloc
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-if [ -f $topsrcdir/mozconfig-extra ] ; then
-  . $topsrcdir/mozconfig-extra
-fi
-if [ -f $topsrcdir/mozconfig-extra-macosx ] ; then
-  . $topsrcdir/mozconfig-extra-macosx
-fi
deleted file mode 100644
--- a/mozilla2/macosx/generic/nightly/mozconfig
+++ /dev/null
@@ -1,26 +0,0 @@
-. $topsrcdir/build/macosx/universal/mozconfig
-
-ac_add_options --enable-application=browser
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --enable-tests
-ac_add_options --disable-install-strip
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-if [ -f $topsrcdir/mozconfig-extra ] ; then
-  . $topsrcdir/mozconfig-extra
-fi
-if [ -f $topsrcdir/mozconfig-extra-macosx ] ; then
-  . $topsrcdir/mozconfig-extra-macosx
-fi
deleted file mode 100644
--- a/mozilla2/macosx/jaegermonkey/debug/mozconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-# Don't use the standard mozconfig. We don't want universal for a debug build. 
-#. $topsrcdir/build/macosx/universal/mozconfig
-
-ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk
-
-ac_add_options --disable-optimize
-ac_add_options --enable-debug
-ac_add_options --enable-libxul
-
-ac_add_options --enable-application=browser
-ac_add_options --enable-tests
-ac_add_options --enable-trace-malloc
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/macosx/jaegermonkey/nightly/mozconfig
+++ /dev/null
@@ -1,20 +0,0 @@
-. $topsrcdir/build/macosx/universal/mozconfig
-
-ac_add_options --enable-application=browser
-ac_add_options --enable-update-channel=nightly-jaegermonkey
-ac_add_options --enable-update-packaging
-ac_add_options --enable-tests
-ac_add_options --disable-install-strip
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
deleted file mode 100644
--- a/mozilla2/macosx/mozilla-aurora/debug/mozconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-# Don't use the standard mozconfig. We don't want universal for a debug build. 
-#. $topsrcdir/build/macosx/universal/mozconfig
-
-ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk
-
-ac_add_options --disable-optimize
-ac_add_options --enable-debug
-ac_add_options --enable-libxul
-
-ac_add_options --enable-application=browser
-ac_add_options --enable-tests
-ac_add_options --enable-trace-malloc
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/macosx/mozilla-aurora/nightly/mozconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-. $topsrcdir/build/macosx/universal/mozconfig
-
-ac_add_options --enable-application=browser
-ac_add_options --enable-update-channel=aurora
-ac_add_options --enable-update-packaging
-ac_add_options --enable-tests
-ac_add_options --disable-install-strip
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-export MOZ_TELEMETRY_REPORTING=1
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
deleted file mode 100644
--- a/mozilla2/macosx/mozilla-aurora/release/mozconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-. $topsrcdir/build/macosx/universal/mozconfig
-
-ac_add_options --enable-application=browser
-ac_add_options --enable-update-channel=beta
-ac_add_options --enable-update-packaging
-ac_add_options --enable-tests
-ac_add_options --enable-official-branding
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-export MOZ_TELEMETRY_REPORTING=1
deleted file mode 100644
--- a/mozilla2/macosx/mozilla-aurora/xulrunner/mozconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-. $topsrcdir/build/macosx/universal/mozconfig
-
-export MOZILLA_OFFICIAL=1
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-ac_add_options --enable-application=xulrunner
-ac_add_options --disable-tests
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
deleted file mode 100644
--- a/mozilla2/macosx/mozilla-beta/debug/mozconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-# Don't use the standard mozconfig. We don't want universal for a debug build. 
-#. $topsrcdir/build/macosx/universal/mozconfig
-
-ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk
-
-ac_add_options --disable-optimize
-ac_add_options --enable-debug
-ac_add_options --enable-libxul
-
-ac_add_options --enable-application=browser
-ac_add_options --enable-tests
-ac_add_options --enable-trace-malloc
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/macosx/mozilla-beta/nightly/mozconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-. $topsrcdir/build/macosx/universal/mozconfig
-
-ac_add_options --enable-application=browser
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --enable-tests
-ac_add_options --disable-install-strip
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-export MOZ_TELEMETRY_REPORTING=1
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
deleted file mode 100644
--- a/mozilla2/macosx/mozilla-beta/release/mozconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-. $topsrcdir/build/macosx/universal/mozconfig
-
-ac_add_options --enable-application=browser
-ac_add_options --enable-update-channel=beta
-ac_add_options --enable-update-packaging
-ac_add_options --enable-tests
-ac_add_options --enable-official-branding
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-export MOZ_TELEMETRY_REPORTING=1
deleted file mode 100644
--- a/mozilla2/macosx/mozilla-beta/xulrunner/mozconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-. $topsrcdir/build/macosx/universal/mozconfig
-
-export MOZILLA_OFFICIAL=1
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-ac_add_options --enable-application=xulrunner
-ac_add_options --disable-tests
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
deleted file mode 100644
--- a/mozilla2/macosx/mozilla-central/debug/mozconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-# Don't use the standard mozconfig. We don't want universal for a debug build. 
-#. $topsrcdir/build/macosx/universal/mozconfig
-
-ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk
-
-ac_add_options --disable-optimize
-ac_add_options --enable-debug
-ac_add_options --enable-libxul
-
-ac_add_options --enable-application=browser
-ac_add_options --enable-tests
-ac_add_options --enable-trace-malloc
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/macosx/mozilla-central/nightly/mozconfig
+++ /dev/null
@@ -1,25 +0,0 @@
-. $topsrcdir/build/macosx/universal/mozconfig
-
-ac_add_options --enable-application=browser
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --enable-tests
-ac_add_options --disable-install-strip
-
-# Mozilla-Central nightlies only since this has a cost in performance
-ac_add_options --enable-js-diagnostics
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-export MOZ_TELEMETRY_REPORTING=1
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
deleted file mode 100644
--- a/mozilla2/macosx/mozilla-central/release/mozconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-. $topsrcdir/build/macosx/universal/mozconfig
-
-ac_add_options --enable-application=browser
-ac_add_options --enable-update-channel=beta
-ac_add_options --enable-update-packaging
-ac_add_options --enable-tests
-ac_add_options --enable-official-branding
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-export MOZ_TELEMETRY_REPORTING=1
deleted file mode 100644
--- a/mozilla2/macosx/mozilla-central/xulrunner/mozconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-. $topsrcdir/build/macosx/universal/mozconfig
-
-export MOZILLA_OFFICIAL=1
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-ac_add_options --enable-application=xulrunner
-ac_add_options --disable-tests
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
deleted file mode 100644
--- a/mozilla2/macosx/mozilla-release/debug/mozconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-# Don't use the standard mozconfig. We don't want universal for a debug build. 
-#. $topsrcdir/build/macosx/universal/mozconfig
-
-ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk
-
-ac_add_options --disable-optimize
-ac_add_options --enable-debug
-ac_add_options --enable-libxul
-
-ac_add_options --enable-application=browser
-ac_add_options --enable-tests
-ac_add_options --enable-trace-malloc
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/macosx/places/debug/mozconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-# Don't use the standard mozconfig. We don't want universal for a debug build. 
-#. $topsrcdir/build/macosx/universal/mozconfig
-
-ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk
-
-ac_add_options --disable-optimize
-ac_add_options --enable-debug
-ac_add_options --enable-libxul
-
-ac_add_options --enable-application=browser
-ac_add_options --enable-tests
-ac_add_options --enable-trace-malloc
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/macosx/places/nightly/mozconfig
+++ /dev/null
@@ -1,23 +0,0 @@
-. $topsrcdir/build/macosx/universal/mozconfig
-
-ac_add_options --enable-application=browser
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --enable-tests
-ac_add_options --disable-install-strip
-
-# Nightlies only since this has a cost in performance
-ac_add_options --enable-js-diagnostics
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-export MOZ_TELEMETRY_REPORTING=1
-mk_add_options MOZ_MAKE_FLAGS="-j4"
deleted file mode 100644
--- a/mozilla2/macosx/places/release/mozconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-. $topsrcdir/build/macosx/universal/mozconfig
-
-ac_add_options --enable-application=browser
-ac_add_options --enable-update-channel=beta
-ac_add_options --enable-update-packaging
-ac_add_options --enable-tests
-ac_add_options --enable-official-branding
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-export MOZ_TELEMETRY_REPORTING=1
deleted file mode 100644
--- a/mozilla2/macosx/places/xulrunner/mozconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-. $topsrcdir/build/macosx/universal/mozconfig
-
-export MOZILLA_OFFICIAL=1
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-ac_add_options --enable-application=xulrunner
-ac_add_options --disable-tests
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
deleted file mode 100644
--- a/mozilla2/macosx/try/debug/mozconfig
+++ /dev/null
@@ -1,28 +0,0 @@
-# Don't use the standard mozconfig. We don't want universal for a debug build. 
-#. $topsrcdir/build/macosx/universal/mozconfig
-
-ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk
-
-ac_add_options --disable-optimize
-ac_add_options --enable-debug
-ac_add_options --enable-libxul
-
-ac_add_options --enable-application=browser
-ac_add_options --enable-tests
-ac_add_options --enable-trace-malloc
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-if [ -f $topsrcdir/mozconfig-extra ] ; then
-  . $topsrcdir/mozconfig-extra
-fi
-if [ -f $topsrcdir/mozconfig-extra-macosx ] ; then
-  . $topsrcdir/mozconfig-extra-macosx
-fi
deleted file mode 100644
--- a/mozilla2/macosx/try/nightly/mozconfig
+++ /dev/null
@@ -1,27 +0,0 @@
-. $topsrcdir/build/macosx/universal/mozconfig
-
-ac_add_options --enable-application=browser
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --enable-tests
-ac_add_options --disable-install-strip
-ac_add_options --disable-auto-deps
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-if [ -f $topsrcdir/mozconfig-extra ] ; then
-  . $topsrcdir/mozconfig-extra
-fi
-if [ -f $topsrcdir/mozconfig-extra-macosx ] ; then
-  . $topsrcdir/mozconfig-extra-macosx
-fi
deleted file mode 100644
--- a/mozilla2/macosx/ux/debug/mozconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-# Don't use the standard mozconfig. We don't want universal for a debug build. 
-#. $topsrcdir/build/macosx/universal/mozconfig
-
-ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk
-
-ac_add_options --disable-optimize
-ac_add_options --enable-debug
-ac_add_options --enable-libxul
-
-ac_add_options --enable-application=browser
-ac_add_options --enable-tests
-ac_add_options --enable-trace-malloc
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/macosx/ux/nightly/mozconfig
+++ /dev/null
@@ -1,20 +0,0 @@
-. $topsrcdir/build/macosx/universal/mozconfig
-
-ac_add_options --enable-application=browser
-ac_add_options --enable-update-channel=nightly-ux
-ac_add_options --enable-update-packaging
-ac_add_options --enable-tests
-ac_add_options --disable-install-strip
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
--- a/simple-talos/config.py
+++ b/simple-talos/config.py
@@ -1,17 +1,9 @@
 platforms = {
-    'leopard-o': {
-        'slaves': ['leopard-o1'],
-        'env': 'mac-perf'
-    },
-    'leopard': {
-        'slaves': ['leopard1'],
-        'env': 'mac-perf'
-    },
     'snowleopard': {
         'slaves': ['snowleopard1'],
         'env': 'mac-perf'
     },
     'snowleopard-r4': {
         'slaves': ['snowleopard-r4-1'],
         'env': 'mac-perf'
     },