Bug 1272723 - Remove b2g r=nthomas draft
authorChris AtLee <catlee@mozilla.com>
Fri, 13 May 2016 13:52:02 -0400
changeset 14166 70e89d5887f3c948165a86a4514d433018bffe5b
parent 14165 af3b8066baf8fe6a8c39d522de47219e3c183527
push id75
push userbmo:catlee@mozilla.com
push dateFri, 13 May 2016 20:42:49 +0000
reviewersnthomas
bugs1272723
Bug 1272723 - Remove b2g r=nthomas MozReview-Commit-ID: 2OwE8xjsZQz
mozilla-tests/BuildSlaves.py.template
mozilla-tests/b2g_config.py
mozilla-tests/b2g_production_config.py
mozilla-tests/b2g_staging_config.py
mozilla-tests/config.py
mozilla-tests/production_config.py
mozilla-tests/scheduler_localconfig.py
mozilla-tests/scheduler_master.cfg
mozilla-tests/staging_config.py
mozilla-tests/tests_localconfig.py
mozilla-tests/tests_master.cfg
mozilla-tests/thunderbird_production_config.py
mozilla-tests/thunderbird_staging_config.py
mozilla-tests/universal_master_sqlite.cfg
mozilla/b2g_config.py
mozilla/b2g_production_config.py
mozilla/b2g_project_branches.py
mozilla/b2g_staging_config.py
mozilla/build_localconfig.py
mozilla/builder_master.cfg
mozilla/config.py
mozilla/passwords.py.template
mozilla/production_config.py
mozilla/scheduler_master.cfg
mozilla/try_localconfig.py
mozilla/universal_master_sqlite.cfg
setup-master.py
--- a/mozilla-tests/BuildSlaves.py.template
+++ b/mozilla-tests/BuildSlaves.py.template
@@ -1,42 +1,32 @@
 SlavePasswords = {
     "linux": "pass",
     "linux64": "pass",
     "ubuntu32_vm": "pass",
-    "ubuntu32_vm-b2gdt": "pass",
     "ubuntu64_vm_mobile": "pass",
     "ubuntu64_vm_armv7_mobile": "pass",
     "ubuntu64_vm": "pass",
     "ubuntu64_vm_large": "pass",
     "ubuntu64_vm_lnx_large": "pass",
     "ubuntu64_vm_armv7_large": "pass",
     "ubuntu64-asan_vm": "pass",
     "ubuntu64-asan_vm_lnx_large": "pass",
-    "ubuntu64_vm-b2g": "pass",
-    "ubuntu64_vm-b2g-emulator": "pass",
-    "ubuntu64_vm-b2g-lg-emulator": "pass",
-    "ubuntu64_vm-b2g-emulator-jb": "pass",
-    "ubuntu64_vm-b2g-emulator-kk": "pass",
-    "ubuntu64_vm-b2g-emulator-l": "pass",
     "ubuntu64_hw": "pass",
-    "ubuntu64_hw-b2g": "pass",
-    "tiger": "pass",
     "snowleopard": "pass",
     "yosemite": "pass",
     "yosemite_r7": "pass",
     "xp": "pass",
     "xp_ix": "pass",
     "win7": "pass",
     "win7_ix": "pass",
     "win7_vm": "pass",
     "win7_vm_gfx": "pass",
     "win8": "pass",
     "win8_64": "pass",
     "win10": "pass",
     "win10_64": "pass",
     "w764": "pass",
     "win64_vm": "pass",
-    "vista": "pass",
 }
 
 blobber_username = 'user'
 blobber_password = 'passwd'
deleted file mode 100644
--- a/mozilla-tests/b2g_config.py
+++ /dev/null
@@ -1,1395 +0,0 @@
-from copy import deepcopy
-
-from config import MOZHARNESS_REBOOT_CMD
-
-import localconfig
-reload(localconfig)
-from localconfig import SLAVES, TRY_SLAVES, GLOBAL_VARS
-
-import b2g_localconfig
-reload(b2g_localconfig)
-
-import master_common
-reload(master_common)
-from master_common import setMainFirefoxVersions, items_before, items_at_least
-
-import config_common
-reload(config_common)
-from config_common import nested_haskey
-
-GLOBAL_VARS = deepcopy(GLOBAL_VARS)
-
-GLOBAL_VARS['stage_username'] = 'ffxbld'
-GLOBAL_VARS.update(b2g_localconfig.GLOBAL_VARS.copy())
-
-BRANCHES = {
-    # Disabled in bug 1227277
-    #'alder': {},
-    # Disabled in bug 1227277
-    #'ash': {},
-    # Not needed right now, see bug 977420
-    # 'birch': {},
-    # Disabled in bug 1227277
-    #'cedar': {},
-    # Disabled for bug 1151699
-    # 'cypress': {},
-    # Disabled for Bug 1150320
-    # 'jamun': {},
-    # disabled in bug 1215527
-    # 'maple': {}
-    'pine': {},
-    'fx-team': {},
-    'mozilla-b2g44_v2_5': {
-        'gecko_version': 44,
-        'b2g_version': (2, 5, 0),
-    },
-    'mozilla-central': {},
-    'mozilla-inbound': {},
-    #'services-central': {},  # Bug 1010674
-    'try': {},
-}
-
-setMainFirefoxVersions(BRANCHES)
-
-PLATFORMS = {
-    'emulator': {},
-    'emulator-jb': {},
-    'emulator-kk': {},
-}
-
-builder_prefix = "b2g"
-
-PLATFORMS['emulator']['slave_platforms'] = ['ubuntu64_vm-b2g-emulator', 'ubuntu64_vm-b2g-lg-emulator']
-PLATFORMS['emulator']['env_name'] = 'linux-perf'
-PLATFORMS['emulator']['ubuntu64_vm-b2g-emulator'] = {'name': "b2g_emulator_vm"}
-PLATFORMS['emulator']['ubuntu64_vm-b2g-lg-emulator'] = {'name': "b2g_emulator_vm_large"}
-PLATFORMS['emulator']['stage_product'] = 'b2g'
-PLATFORMS['emulator']['mozharness_config'] = {
-    'mozharness_python': '/tools/buildbot/bin/python',
-    'use_mozharness': True,
-    'hg_bin': 'hg',
-    'reboot_command': ['/tools/buildbot/bin/python'] + MOZHARNESS_REBOOT_CMD,
-}
-
-PLATFORMS['emulator-jb']['slave_platforms'] = ['ubuntu64_vm-b2g-emulator-jb']
-PLATFORMS['emulator-jb']['env_name'] = 'linux-perf'
-PLATFORMS['emulator-jb']['ubuntu64_vm-b2g-emulator-jb'] = {'name': "b2g_emulator-jb_vm"}
-PLATFORMS['emulator-jb']['stage_product'] = 'b2g'
-PLATFORMS['emulator-jb']['mozharness_config'] = {
-    'mozharness_python': '/tools/buildbot/bin/python',
-    'use_mozharness': True,
-    'hg_bin': 'hg',
-    'reboot_command': ['/tools/buildbot/bin/python'] + MOZHARNESS_REBOOT_CMD,
-}
-
-PLATFORMS['emulator-kk']['slave_platforms'] = ['ubuntu64_vm-b2g-emulator-kk']
-PLATFORMS['emulator-kk']['env_name'] = 'linux-perf'
-PLATFORMS['emulator-kk']['ubuntu64_vm-b2g-emulator-kk'] = {'name': "b2g_emulator-kk_vm"}
-PLATFORMS['emulator-kk']['stage_product'] = 'b2g'
-PLATFORMS['emulator-kk']['mozharness_config'] = {
-    'mozharness_python': '/tools/buildbot/bin/python',
-    'use_mozharness': True,
-    'hg_bin': 'hg',
-    'reboot_command': ['/tools/buildbot/bin/python'] + MOZHARNESS_REBOOT_CMD,
-}
-
-# Lets be explicit instead of magical.
-for platform, platform_config in PLATFORMS.iteritems():
-    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']
-
-BRANCH_UNITTEST_VARS = {
-    'hghost': 'hg.mozilla.org',
-    # turn on platforms as we get them running
-    'platforms': {
-        'emulator': {},
-        'emulator-jb': {},
-        'emulator-kk': {},
-    },
-}
-
-SUITES = {}
-
-MOCHITEST = [
-    ('mochitest-1', {'suite': 'mochitest-plain',
-                     'use_mozharness': True,
-                     'script_path': 'scripts/b2g_emulator_unittest.py',
-                     'blob_upload': True,
-                     'script_maxtime': 14400,
-                     },
-     ),
-    ('mochitest-2', {'suite': 'mochitest-plain',
-                     'use_mozharness': True,
-                     'script_path': 'scripts/b2g_emulator_unittest.py',
-                     'blob_upload': True,
-                     'script_maxtime': 14400,
-                     },
-     ),
-    ('mochitest-3', {'suite': 'mochitest-plain',
-                     'use_mozharness': True,
-                     'script_path': 'scripts/b2g_emulator_unittest.py',
-                     'blob_upload': True,
-                     'script_maxtime': 14400,
-                     },
-     ),
-    ('mochitest-4', {'suite': 'mochitest-plain',
-                     'use_mozharness': True,
-                     'script_path': 'scripts/b2g_emulator_unittest.py',
-                     'blob_upload': True,
-                     'script_maxtime': 14400,
-                     },
-     ),
-    ('mochitest-5', {'suite': 'mochitest-plain',
-                     'use_mozharness': True,
-                     'script_path': 'scripts/b2g_emulator_unittest.py',
-                     'blob_upload': True,
-                     'script_maxtime': 14400,
-                     },
-     ),
-    ('mochitest-6', {'suite': 'mochitest-plain',
-                     'use_mozharness': True,
-                     'script_path': 'scripts/b2g_emulator_unittest.py',
-                     'blob_upload': True,
-                     'script_maxtime': 14400,
-                     },
-     ),
-    ('mochitest-7', {'suite': 'mochitest-plain',
-                     'use_mozharness': True,
-                     'script_path': 'scripts/b2g_emulator_unittest.py',
-                     'blob_upload': True,
-                     'script_maxtime': 14400,
-                     },
-     ),
-    ('mochitest-8', {'suite': 'mochitest-plain',
-                     'use_mozharness': True,
-                     'script_path': 'scripts/b2g_emulator_unittest.py',
-                     'blob_upload': True,
-                     'script_maxtime': 14400,
-                     },
-     ),
-    ('mochitest-9', {'suite': 'mochitest-plain',
-                     'use_mozharness': True,
-                     'script_path': 'scripts/b2g_emulator_unittest.py',
-                     'blob_upload': True,
-                     'script_maxtime': 14400,
-                     },
-     ),
-]
-MOCHITEST_CHROME = [
-    ('mochitest-chrome', {'suite': 'mochitest-chrome',
-                          'use_mozharness': True,
-                          'script_path': 'scripts/b2g_emulator_unittest.py',
-                          'blob_upload': True,
-                         },
-    ),
-]
-
-MOCHITEST_EMULATOR_DEBUG = [
-    ('mochitest-debug-1', {'suite': 'mochitest-plain',
-                           'use_mozharness': True,
-                           'script_path': 'scripts/b2g_emulator_unittest.py',
-                           'blob_upload': True,
-                           'script_maxtime': 14400,
-                           },
-     ),
-    ('mochitest-debug-2', {'suite': 'mochitest-plain',
-                           'use_mozharness': True,
-                           'script_path': 'scripts/b2g_emulator_unittest.py',
-                           'blob_upload': True,
-                           'script_maxtime': 14400,
-                           },
-     ),
-    ('mochitest-debug-3', {'suite': 'mochitest-plain',
-                           'use_mozharness': True,
-                           'script_path': 'scripts/b2g_emulator_unittest.py',
-                           'blob_upload': True,
-                           'script_maxtime': 14400,
-                           },
-     ),
-    ('mochitest-debug-4', {'suite': 'mochitest-plain',
-                           'use_mozharness': True,
-                           'script_path': 'scripts/b2g_emulator_unittest.py',
-                           'blob_upload': True,
-                           'script_maxtime': 14400,
-                           },
-     ),
-    ('mochitest-debug-5', {'suite': 'mochitest-plain',
-                           'use_mozharness': True,
-                           'script_path': 'scripts/b2g_emulator_unittest.py',
-                           'blob_upload': True,
-                           'script_maxtime': 14400,
-                           },
-     ),
-    ('mochitest-debug-6', {'suite': 'mochitest-plain',
-                           'use_mozharness': True,
-                           'script_path': 'scripts/b2g_emulator_unittest.py',
-                           'blob_upload': True,
-                           'script_maxtime': 14400,
-                           },
-     ),
-    ('mochitest-debug-7', {'suite': 'mochitest-plain',
-                           'use_mozharness': True,
-                           'script_path': 'scripts/b2g_emulator_unittest.py',
-                           'blob_upload': True,
-                           'script_maxtime': 14400,
-                           },
-     ),
-    ('mochitest-debug-8', {'suite': 'mochitest-plain',
-                           'use_mozharness': True,
-                           'script_path': 'scripts/b2g_emulator_unittest.py',
-                           'blob_upload': True,
-                           'script_maxtime': 14400,
-                           },
-     ),
-    ('mochitest-debug-9', {'suite': 'mochitest-plain',
-                           'use_mozharness': True,
-                           'script_path': 'scripts/b2g_emulator_unittest.py',
-                           'blob_upload': True,
-                           'script_maxtime': 14400,
-                           },
-     ),
-    ('mochitest-debug-10', {'suite': 'mochitest-plain',
-                            'use_mozharness': True,
-                            'script_path': 'scripts/b2g_emulator_unittest.py',
-                            'blob_upload': True,
-                            'script_maxtime': 14400,
-                            },
-     ),
-    ('mochitest-debug-11', {'suite': 'mochitest-plain',
-                            'use_mozharness': True,
-                            'script_path': 'scripts/b2g_emulator_unittest.py',
-                            'blob_upload': True,
-                            'script_maxtime': 14400,
-                            },
-     ),
-    ('mochitest-debug-12', {'suite': 'mochitest-plain',
-                            'use_mozharness': True,
-                            'script_path': 'scripts/b2g_emulator_unittest.py',
-                            'blob_upload': True,
-                            'script_maxtime': 14400,
-                            },
-     ),
-    ('mochitest-debug-13', {'suite': 'mochitest-plain',
-                            'use_mozharness': True,
-                            'script_path': 'scripts/b2g_emulator_unittest.py',
-                            'blob_upload': True,
-                            'script_maxtime': 14400,
-                            },
-     ),
-    ('mochitest-debug-14', {'suite': 'mochitest-plain',
-                            'use_mozharness': True,
-                            'script_path': 'scripts/b2g_emulator_unittest.py',
-                            'blob_upload': True,
-                            'script_maxtime': 14400,
-                            },
-     ),
-    ('mochitest-debug-15', {'suite': 'mochitest-plain',
-                            'use_mozharness': True,
-                            'script_path': 'scripts/b2g_emulator_unittest.py',
-                            'blob_upload': True,
-                            'script_maxtime': 14400,
-                            },
-     ),
-    ('mochitest-debug-16', {'suite': 'mochitest-plain',
-                            'use_mozharness': True,
-                            'script_path': 'scripts/b2g_emulator_unittest.py',
-                            'blob_upload': True,
-                            'script_maxtime': 14400,
-                            },
-     ),
-    ('mochitest-debug-17', {'suite': 'mochitest-plain',
-                            'use_mozharness': True,
-                            'script_path': 'scripts/b2g_emulator_unittest.py',
-                            'blob_upload': True,
-                            'script_maxtime': 14400,
-                            },
-     ),
-    ('mochitest-debug-18', {'suite': 'mochitest-plain',
-                            'use_mozharness': True,
-                            'script_path': 'scripts/b2g_emulator_unittest.py',
-                            'blob_upload': True,
-                            'script_maxtime': 14400,
-                            },
-     ),
-    ('mochitest-debug-19', {'suite': 'mochitest-plain',
-                            'use_mozharness': True,
-                            'script_path': 'scripts/b2g_emulator_unittest.py',
-                            'blob_upload': True,
-                            'script_maxtime': 14400,
-                            },
-     ),
-    ('mochitest-debug-20', {'suite': 'mochitest-plain',
-                            'use_mozharness': True,
-                            'script_path': 'scripts/b2g_emulator_unittest.py',
-                            'blob_upload': True,
-                            'script_maxtime': 14400,
-                            },
-     ),
-    ('mochitest-debug-21', {'suite': 'mochitest-plain',
-                            'use_mozharness': True,
-                            'script_path': 'scripts/b2g_emulator_unittest.py',
-                            'blob_upload': True,
-                            'script_maxtime': 14400,
-                            },
-     ),
-    ('mochitest-debug-22', {'suite': 'mochitest-plain',
-                            'use_mozharness': True,
-                            'script_path': 'scripts/b2g_emulator_unittest.py',
-                            'blob_upload': True,
-                            'script_maxtime': 14400,
-                            },
-     ),
-    ('mochitest-debug-23', {'suite': 'mochitest-plain',
-                            'use_mozharness': True,
-                            'script_path': 'scripts/b2g_emulator_unittest.py',
-                            'blob_upload': True,
-                            'script_maxtime': 14400,
-                            },
-     ),
-    ('mochitest-debug-24', {'suite': 'mochitest-plain',
-                            'use_mozharness': True,
-                            'script_path': 'scripts/b2g_emulator_unittest.py',
-                            'blob_upload': True,
-                            'script_maxtime': 14400,
-                            },
-     ),
-    ('mochitest-debug-25', {'suite': 'mochitest-plain',
-                            'use_mozharness': True,
-                            'script_path': 'scripts/b2g_emulator_unittest.py',
-                            'blob_upload': True,
-                            'script_maxtime': 14400,
-                            },
-     ),
-]
-
-MOCHITEST_OOP_DESKTOP = [
-    ('mochitest-oop-1', {'suite': 'mochitest-plain',
-                         'use_mozharness': True,
-                         'script_path': 'scripts/b2g_desktop_unittest.py',
-                         'blob_upload': True,
-                        },
-     ),
-]
-
-GAIA_JS_INTEGRATION = [
-    ('gaia-js-integration-1', {'suite': 'gaia-js-integration',
-                           'use_mozharness': True,
-                           'script_path': 'scripts/gaia_integration.py',
-                           'timeout': 1800,
-                           },
-    ),
-    ('gaia-js-integration-2', {'suite': 'gaia-js-integration',
-                           'use_mozharness': True,
-                           'script_path': 'scripts/gaia_integration.py',
-                           'timeout': 1800,
-                           },
-    ),
-    ('gaia-js-integration-3', {'suite': 'gaia-js-integration',
-                           'use_mozharness': True,
-                           'script_path': 'scripts/gaia_integration.py',
-                           'timeout': 1800,
-                           },
-    ),
-    ('gaia-js-integration-4', {'suite': 'gaia-js-integration',
-                           'use_mozharness': True,
-                           'script_path': 'scripts/gaia_integration.py',
-                           'timeout': 1800,
-                           },
-    ),
-    ('gaia-js-integration-5', {'suite': 'gaia-js-integration',
-                           'use_mozharness': True,
-                           'script_path': 'scripts/gaia_integration.py',
-                           'timeout': 1800,
-                           },
-    ),
-    ('gaia-js-integration-6', {'suite': 'gaia-js-integration',
-                           'use_mozharness': True,
-                           'script_path': 'scripts/gaia_integration.py',
-                           'timeout': 1800,
-                           },
-    ),
-    ('gaia-js-integration-7', {'suite': 'gaia-js-integration',
-                           'use_mozharness': True,
-                           'script_path': 'scripts/gaia_integration.py',
-                           'timeout': 1800,
-                           },
-    ),
-    ('gaia-js-integration-8', {'suite': 'gaia-js-integration',
-                           'use_mozharness': True,
-                           'script_path': 'scripts/gaia_integration.py',
-                           'timeout': 1800,
-                           },
-    ),
-    ('gaia-js-integration-9', {'suite': 'gaia-js-integration',
-                           'use_mozharness': True,
-                           'script_path': 'scripts/gaia_integration.py',
-                           'timeout': 1800,
-                           },
-    ),
-    ('gaia-js-integration-10', {'suite': 'gaia-js-integration',
-                           'use_mozharness': True,
-                           'script_path': 'scripts/gaia_integration.py',
-                           'timeout': 1800,
-                           },
-    ),
-]
-
-REFTEST = [
-    ('reftest-1', {'suite': 'reftest',
-                   'use_mozharness': True,
-                   'script_path': 'scripts/b2g_emulator_unittest.py',
-                   'blob_upload': True,
-                   },
-     ),
-    ('reftest-2', {'suite': 'reftest',
-                   'use_mozharness': True,
-                   'script_path': 'scripts/b2g_emulator_unittest.py',
-                   'blob_upload': True,
-                   },
-     ),
-    ('reftest-3', {'suite': 'reftest',
-                   'use_mozharness': True,
-                   'script_path': 'scripts/b2g_emulator_unittest.py',
-                   'blob_upload': True,
-                   },
-     ),
-    ('reftest-4', {'suite': 'reftest',
-                   'use_mozharness': True,
-                   'script_path': 'scripts/b2g_emulator_unittest.py',
-                   'blob_upload': True,
-                   },
-     ),
-    ('reftest-5', {'suite': 'reftest',
-                   'use_mozharness': True,
-                   'script_path': 'scripts/b2g_emulator_unittest.py',
-                   'blob_upload': True,
-                   },
-     ),
-    ('reftest-6', {'suite': 'reftest',
-                   'use_mozharness': True,
-                   'script_path': 'scripts/b2g_emulator_unittest.py',
-                   'blob_upload': True,
-                   },
-     ),
-    ('reftest-7', {'suite': 'reftest',
-                   'use_mozharness': True,
-                   'script_path': 'scripts/b2g_emulator_unittest.py',
-                   'blob_upload': True,
-                   },
-     ),
-    ('reftest-8', {'suite': 'reftest',
-                   'use_mozharness': True,
-                   'script_path': 'scripts/b2g_emulator_unittest.py',
-                   'blob_upload': True,
-                   },
-     ),
-    ('reftest-9', {'suite': 'reftest',
-                   'use_mozharness': True,
-                   'script_path': 'scripts/b2g_emulator_unittest.py',
-                   'blob_upload': True,
-                   },
-     ),
-    ('reftest-10', {'suite': 'reftest',
-                    'use_mozharness': True,
-                    'script_path': 'scripts/b2g_emulator_unittest.py',
-                    'blob_upload': True,
-                    },
-     ),
-]
-
-REFTEST_20 = REFTEST[:]
-REFTEST_20 += [
-    ('reftest-11', {'suite': 'reftest',
-                    'use_mozharness': True,
-                    'script_path': 'scripts/b2g_emulator_unittest.py',
-                    'blob_upload': True,
-                    },
-     ),
-    ('reftest-12', {'suite': 'reftest',
-                    'use_mozharness': True,
-                    'script_path': 'scripts/b2g_emulator_unittest.py',
-                    'blob_upload': True,
-                    },
-     ),
-    ('reftest-13', {'suite': 'reftest',
-                    'use_mozharness': True,
-                    'script_path': 'scripts/b2g_emulator_unittest.py',
-                    'blob_upload': True,
-                    },
-     ),
-    ('reftest-14', {'suite': 'reftest',
-                    'use_mozharness': True,
-                    'script_path': 'scripts/b2g_emulator_unittest.py',
-                    'blob_upload': True,
-                    },
-     ),
-    ('reftest-15', {'suite': 'reftest',
-                    'use_mozharness': True,
-                    'script_path': 'scripts/b2g_emulator_unittest.py',
-                    'blob_upload': True,
-                    },
-     ),
-    ('reftest-16', {'suite': 'reftest',
-                    'use_mozharness': True,
-                    'script_path': 'scripts/b2g_emulator_unittest.py',
-                    'blob_upload': True,
-                    },
-     ),
-    ('reftest-17', {'suite': 'reftest',
-                    'use_mozharness': True,
-                    'script_path': 'scripts/b2g_emulator_unittest.py',
-                    'blob_upload': True,
-                    },
-     ),
-    ('reftest-18', {'suite': 'reftest',
-                    'use_mozharness': True,
-                    'script_path': 'scripts/b2g_emulator_unittest.py',
-                    'blob_upload': True,
-                    },
-     ),
-    ('reftest-19', {'suite': 'reftest',
-                    'use_mozharness': True,
-                    'script_path': 'scripts/b2g_emulator_unittest.py',
-                    'blob_upload': True,
-                    },
-     ),
-    ('reftest-20', {'suite': 'reftest',
-                    'use_mozharness': True,
-                    'script_path': 'scripts/b2g_emulator_unittest.py',
-                    'blob_upload': True,
-                    },
-     ),
-]
-
-REFTEST_DESKTOP_OOP_SANITY = [
-    ('reftest-sanity-oop', {'suite': 'reftest',
-                            'use_mozharness': True,
-                            'script_path': 'scripts/b2g_desktop_unittest.py',
-                            'blob_upload': True,
-                           },
-     ),
-]
-
-JSREFTEST = [
-    ('jsreftest-1', {'suite': 'jsreftest',
-                     'use_mozharness': True,
-                     'script_path': 'scripts/b2g_emulator_unittest.py',
-                     'blob_upload': True,
-                     },
-     ),
-    ('jsreftest-2', {'suite': 'jsreftest',
-                     'use_mozharness': True,
-                     'script_path': 'scripts/b2g_emulator_unittest.py',
-                     'blob_upload': True,
-                     },
-     ),
-    ('jsreftest-3', {'suite': 'jsreftest',
-                     'use_mozharness': True,
-                     'script_path': 'scripts/b2g_emulator_unittest.py',
-                     'blob_upload': True,
-                     },
-     ),
-]
-
-CRASHTEST = [
-    ('crashtest-1', {'suite': 'crashtest',
-                     'use_mozharness': True,
-                     'script_path': 'scripts/b2g_emulator_unittest.py',
-                     'blob_upload': True,
-                     },
-     ),
-    ('crashtest-2', {'suite': 'crashtest',
-                     'use_mozharness': True,
-                     'script_path': 'scripts/b2g_emulator_unittest.py',
-                     'blob_upload': True,
-                     },
-     ),
-    ('crashtest-3', {'suite': 'crashtest',
-                     'use_mozharness': True,
-                     'script_path': 'scripts/b2g_emulator_unittest.py',
-                     'blob_upload': True,
-                     },
-     ),
-]
-
-MARIONETTE = [
-    ('marionette-webapi', {'suite': 'marionette-webapi',
-                           'use_mozharness': True,
-                           'script_path': 'scripts/marionette.py',
-                           'blob_upload': True,
-                           },
-     ),
-]
-
-XPCSHELL = [
-    ('xpcshell', {'suite': 'xpcshell',
-                  'use_mozharness': True,
-                  'script_path': 'scripts/b2g_emulator_unittest.py',
-                  'blob_upload': True,
-                  },
-     ),
-]
-
-XPCSHELL_CHUNKED = [
-    ('xpcshell-1', {'suite': 'xpcshell',
-                    'use_mozharness': True,
-                    'script_path': 'scripts/b2g_emulator_unittest.py',
-                    'blob_upload': True,
-                    },
-     ),
-    ('xpcshell-2', {'suite': 'xpcshell',
-                    'use_mozharness': True,
-                    'script_path': 'scripts/b2g_emulator_unittest.py',
-                    'blob_upload': True,
-                    },
-     ),
-    ('xpcshell-3', {'suite': 'xpcshell',
-                    'use_mozharness': True,
-                    'script_path': 'scripts/b2g_emulator_unittest.py',
-                    'blob_upload': True,
-                    },
-     ),
-    ('xpcshell-4', {'suite': 'xpcshell',
-                    'use_mozharness': True,
-                    'script_path': 'scripts/b2g_emulator_unittest.py',
-                    'blob_upload': True,
-                    },
-     ),
-]
-
-GAIA_INTEGRATION = [(
-    'gaia-integration', {
-        'suite': 'gaia-integration',
-        'use_mozharness': True,
-        'script_path': 'scripts/gaia_integration.py',
-        'timeout': 1800,
-    },
-)]
-
-GAIA_BUILD = [(
-    'gaia-build', {
-        'suite': 'gaia-build',
-        'use_mozharness': True,
-        'script_path': 'scripts/gaia_build_integration.py',
-        'timeout': 1800,
-    },
-)]
-
-GAIA_BUILD_UNIT = [(
-    'gaia-build-unit', {
-        'suite': 'gaia-build-unit',
-        'use_mozharness': True,
-        'script_path': 'scripts/gaia_build_unit.py',
-        'timeout': 1800,
-    },
-)]
-
-GAIA_LINTER = [(
-    'gaia-linter', {
-        'suite': 'gaia-linter',
-        'use_mozharness': True,
-        'script_path': 'scripts/gaia_linter.py',
-        'timeout': 1800,
-    },
-)]
-
-GAIA_UNITTESTS = [(
-    'gaia-unit', {
-        'suite': 'gaia-unit',
-        'use_mozharness': True,
-        'script_path': 'scripts/gaia_unit.py',
-        'blob_upload': True,
-    },
-)]
-
-CPPUNIT = [(
-    'cppunit', {
-        'suite': 'cppunit',
-        'use_mozharness': True,
-        'script_path': 'scripts/b2g_emulator_unittest.py',
-        'blob_upload': True,
-    },
-)]
-
-ALL_UNITTESTS = MOCHITEST + REFTEST + CRASHTEST + MARIONETTE + XPCSHELL
-
-# Default set of unit tests
-UNITTEST_SUITES = {
-    'opt_unittest_suites': ALL_UNITTESTS[:],
-    'debug_unittest_suites': [],
-}
-
-# You must define opt_unittest_suites when enable_opt_unittests is True for a
-# platform. Likewise debug_unittest_suites for enable_debug_unittests
-PLATFORM_UNITTEST_VARS = {
-    'emulator': {
-        'product_name': 'b2g',
-        'app_name': 'b2g',
-        'brand_name': 'Gecko',
-        'builds_before_reboot': 1,
-        'unittest-env': {'DISPLAY': ':0'},
-        'enable_opt_unittests': True,
-        'enable_debug_unittests': True,
-        'ubuntu64_vm-b2g-emulator': {
-            'opt_unittest_suites': MOCHITEST + CRASHTEST + XPCSHELL + MARIONETTE + CPPUNIT + REFTEST_20,
-            'debug_unittest_suites': MOCHITEST_EMULATOR_DEBUG + XPCSHELL_CHUNKED + CPPUNIT,
-            'suite_config': {
-                'marionette': {
-                  'extra_args': [
-                      "--cfg", "marionette/automation_emulator_config.py",
-                  ],
-                },
-                'marionette-webapi': {
-                    'extra_args': [
-                        "--cfg", "marionette/automation_emulator_config.py",
-                        "--test-manifest", "webapi-tests.ini"
-                    ],
-                },
-                'mochitest-media': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'mochitest',
-                        '--test-path', 'dom/media/tests/',
-                    ],
-                },
-                'mochitest-chrome': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'mochitest-chrome',
-                    ],
-                },
-                'mochitest-1': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'mochitest',
-                        '--this-chunk', '1', '--total-chunks', '9',
-                    ],
-                },
-                'mochitest-2': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'mochitest',
-                        '--this-chunk', '2', '--total-chunks', '9',
-                    ],
-                },
-                'mochitest-3': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'mochitest',
-                        '--this-chunk', '3', '--total-chunks', '9',
-                    ],
-                },
-                'mochitest-4': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'mochitest',
-                        '--this-chunk', '4', '--total-chunks', '9',
-                    ],
-                },
-                'mochitest-5': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'mochitest',
-                        '--this-chunk', '5', '--total-chunks', '9',
-                    ],
-                },
-                'mochitest-6': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'mochitest',
-                        '--this-chunk', '6', '--total-chunks', '9',
-                    ],
-                },
-                'mochitest-7': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'mochitest',
-                        '--this-chunk', '7', '--total-chunks', '9',
-                    ],
-                },
-                'mochitest-8': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'mochitest',
-                        '--this-chunk', '8', '--total-chunks', '9',
-                    ],
-                },
-                'mochitest-9': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'mochitest',
-                        '--this-chunk', '9', '--total-chunks', '9',
-                    ],
-                },
-                'mochitest-debug-1': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'mochitest',
-                        '--this-chunk', '1', '--total-chunks', '25',
-                    ],
-                },
-                'mochitest-debug-2': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'mochitest',
-                        '--this-chunk', '2', '--total-chunks', '25',
-                    ],
-                },
-                'mochitest-debug-3': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'mochitest',
-                        '--this-chunk', '3', '--total-chunks', '25',
-                    ],
-                },
-                'mochitest-debug-4': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'mochitest',
-                        '--this-chunk', '4', '--total-chunks', '25',
-                    ],
-                },
-                'mochitest-debug-5': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'mochitest',
-                        '--this-chunk', '5', '--total-chunks', '25',
-                    ],
-                },
-                'mochitest-debug-6': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'mochitest',
-                        '--this-chunk', '6', '--total-chunks', '25',
-                    ],
-                },
-                'mochitest-debug-7': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'mochitest',
-                        '--this-chunk', '7', '--total-chunks', '25',
-                    ],
-                },
-                'mochitest-debug-8': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'mochitest',
-                        '--this-chunk', '8', '--total-chunks', '25',
-                    ],
-                },
-                'mochitest-debug-9': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'mochitest',
-                        '--this-chunk', '9', '--total-chunks', '25',
-                    ],
-                },
-                'mochitest-debug-10': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'mochitest',
-                        '--this-chunk', '10', '--total-chunks', '25',
-                    ],
-                },
-                'mochitest-debug-11': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'mochitest',
-                        '--this-chunk', '11', '--total-chunks', '25',
-                    ],
-                },
-                'mochitest-debug-12': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'mochitest',
-                        '--this-chunk', '12', '--total-chunks', '25',
-                    ],
-                },
-                'mochitest-debug-13': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'mochitest',
-                        '--this-chunk', '13', '--total-chunks', '25',
-                    ],
-                },
-                'mochitest-debug-14': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'mochitest',
-                        '--this-chunk', '14', '--total-chunks', '25',
-                    ],
-                },
-                'mochitest-debug-15': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'mochitest',
-                        '--this-chunk', '15', '--total-chunks', '25',
-                    ],
-                },
-                'mochitest-debug-16': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'mochitest',
-                        '--this-chunk', '16', '--total-chunks', '25',
-                    ],
-                },
-                'mochitest-debug-17': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'mochitest',
-                        '--this-chunk', '17', '--total-chunks', '25',
-                    ],
-                },
-                'mochitest-debug-18': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'mochitest',
-                        '--this-chunk', '18', '--total-chunks', '25',
-                    ],
-                },
-                'mochitest-debug-19': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'mochitest',
-                        '--this-chunk', '19', '--total-chunks', '25',
-                    ],
-                },
-                'mochitest-debug-20': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'mochitest',
-                        '--this-chunk', '20', '--total-chunks', '25',
-                    ],
-                },
-                'mochitest-debug-21': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'mochitest',
-                        '--this-chunk', '21', '--total-chunks', '25',
-                    ],
-                },
-                'mochitest-debug-22': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'mochitest',
-                        '--this-chunk', '22', '--total-chunks', '25',
-                    ],
-                },
-                'mochitest-debug-23': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'mochitest',
-                        '--this-chunk', '23', '--total-chunks', '25',
-                    ],
-                },
-                'mochitest-debug-24': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'mochitest',
-                        '--this-chunk', '24', '--total-chunks', '25',
-                    ],
-                },
-                'mochitest-debug-25': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'mochitest',
-                        '--this-chunk', '25', '--total-chunks', '25',
-                    ],
-                },
-                'xpcshell': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'xpcshell',
-                    ],
-                },
-                'xpcshell-1': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'xpcshell',
-                        '--this-chunk', '1', '--total-chunks', '4'
-                    ],
-                },
-                'xpcshell-2': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'xpcshell',
-                        '--this-chunk', '2', '--total-chunks', '4'
-                    ],
-                },
-                'xpcshell-3': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'xpcshell',
-                        '--this-chunk', '3', '--total-chunks', '4'
-                    ],
-                },
-                'xpcshell-4': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'xpcshell',
-                        '--this-chunk', '4', '--total-chunks', '4'
-                    ],
-                },
-                'crashtest-1': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'crashtest',
-                        '--this-chunk', '1', '--total-chunks', '3',
-                    ],
-                },
-                'crashtest-2': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'crashtest',
-                        '--this-chunk', '2', '--total-chunks', '3',
-                    ],
-                },
-                'crashtest-3': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'crashtest',
-                        '--this-chunk', '3', '--total-chunks', '3',
-                    ],
-                },
-                'reftest-sanity': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'reftest',
-                        '--test-manifest', 'tests/layout/reftests/reftest-sanity/reftest.list',
-                    ],
-                },
-                'reftest-1': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'reftest',
-                        '--this-chunk', '1', '--total-chunks', '20',
-                    ],
-                },
-                'reftest-2': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'reftest',
-                        '--this-chunk', '2', '--total-chunks', '20',
-                    ],
-                },
-                'reftest-3': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'reftest',
-                        '--this-chunk', '3', '--total-chunks', '20',
-                    ],
-                },
-                'reftest-4': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'reftest',
-                        '--this-chunk', '4', '--total-chunks', '20',
-                    ],
-                },
-                'reftest-5': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'reftest',
-                        '--this-chunk', '5', '--total-chunks', '20',
-                    ],
-                },
-                'reftest-6': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'reftest',
-                        '--this-chunk', '6', '--total-chunks', '20',
-                    ],
-                },
-                'reftest-7': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'reftest',
-                        '--this-chunk', '7', '--total-chunks', '20',
-                    ],
-                },
-                'reftest-8': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'reftest',
-                        '--this-chunk', '8', '--total-chunks', '20',
-                    ],
-                },
-                'reftest-9': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'reftest',
-                        '--this-chunk', '9', '--total-chunks', '20',
-                    ],
-                },
-                'reftest-10': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'reftest',
-                        '--this-chunk', '10', '--total-chunks', '20',
-                    ],
-                },
-                'reftest-11': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'reftest',
-                        '--this-chunk', '11', '--total-chunks', '20',
-                    ],
-                },
-                'reftest-12': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'reftest',
-                        '--this-chunk', '12', '--total-chunks', '20',
-                    ],
-                },
-                'reftest-13': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'reftest',
-                        '--this-chunk', '13', '--total-chunks', '20',
-                    ],
-                },
-                'reftest-14': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'reftest',
-                        '--this-chunk', '14', '--total-chunks', '20',
-                    ],
-                },
-                'reftest-15': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'reftest',
-                        '--this-chunk', '15', '--total-chunks', '20',
-                    ],
-                },
-                'reftest-16': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'reftest',
-                        '--this-chunk', '16', '--total-chunks', '20',
-                    ],
-                },
-                'reftest-17': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'reftest',
-                        '--this-chunk', '17', '--total-chunks', '20',
-                    ],
-                },
-                'reftest-18': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'reftest',
-                        '--this-chunk', '18', '--total-chunks', '20',
-                    ],
-                },
-                'reftest-19': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'reftest',
-                        '--this-chunk', '19', '--total-chunks', '20',
-                    ],
-                },
-                'reftest-20': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'reftest',
-                        '--this-chunk', '20', '--total-chunks', '20',
-                    ],
-                },
-                'jsreftest-1': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'jsreftest',
-                        '--this-chunk', '1', '--total-chunks', '3',
-                    ],
-                },
-                'jsreftest-2': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'jsreftest',
-                        '--this-chunk', '2', '--total-chunks', '3',
-                    ],
-                },
-                'jsreftest-3': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'jsreftest',
-                        '--this-chunk', '3', '--total-chunks', '3',
-                    ],
-                },
-                'cppunit': {
-                    'extra_args': [
-                        '--cfg', 'b2g/emulator_automation_config.py',
-                        '--test-suite', 'cppunittest',
-                    ],
-                },
-            },
-        },
-    },
-    'emulator-jb': {
-        'product_name': 'b2g',
-        'app_name': 'b2g',
-        'brand_name': 'Gecko',
-        'builds_before_reboot': 1,
-        'unittest-env': {'DISPLAY': ':0'},
-        'enable_opt_unittests': False,
-        'enable_debug_unittests': False,
-        'ubuntu64_vm-b2g-emulator-jb': {
-            'opt_unittest_suites': [],
-            'debug_unittest_suites': [],
-            'suite_config': {},
-        },
-    },
-    'emulator-kk': {
-        'product_name': 'b2g',
-        'app_name': 'b2g',
-        'brand_name': 'Gecko',
-        'builds_before_reboot': 1,
-        'unittest-env': {'DISPLAY': ':0'},
-        'enable_opt_unittests': False,
-        'enable_debug_unittests': False,
-        'ubuntu64_vm-b2g-emulator-kk': {
-            'opt_unittest_suites': [],
-            'debug_unittest_suites': [],
-            'suite_config': {},
-        },
-    },
-}
-
-# Copy unittest vars in first, then platform vars
-for branch in BRANCHES.keys():
-    for key, value in GLOBAL_VARS.iteritems():
-        # Don't override platforms if it's set
-        if key == 'platforms' and 'platforms' in BRANCHES[branch]:
-            continue
-        BRANCHES[branch][key] = deepcopy(value)
-
-    for key, value in BRANCH_UNITTEST_VARS.iteritems():
-        # Don't override platforms if it's set and locked
-        if key == 'platforms' and 'platforms' in BRANCHES[branch] and BRANCHES[branch].get('lock_platforms'):
-            continue
-        BRANCHES[branch][key] = deepcopy(value)
-
-    for platform, platform_config in PLATFORM_UNITTEST_VARS.iteritems():
-        if platform in BRANCHES[branch]['platforms']:
-            for key, value in platform_config.iteritems():
-                value = deepcopy(value)
-                if isinstance(value, str):
-                    value = value % locals()
-                BRANCHES[branch]['platforms'][platform][key] = value
-
-    # Copy in local config
-    if branch in b2g_localconfig.BRANCHES:
-        for key, value in b2g_localconfig.BRANCHES[branch].iteritems():
-            if key == 'platforms':
-                # Merge in these values
-                if 'platforms' not in BRANCHES[branch]:
-                    BRANCHES[branch]['platforms'] = {}
-
-                for platform, platform_config in value.iteritems():
-                    for key, value in platform_config.iteritems():
-                        value = deepcopy(value)
-                        if isinstance(value, str):
-                            value = value % locals()
-                        BRANCHES[branch]['platforms'][platform][key] = value
-            else:
-                BRANCHES[branch][key] = deepcopy(value)
-
-    for platform, platform_config in b2g_localconfig.PLATFORM_VARS.iteritems():
-        if platform in BRANCHES[branch]['platforms']:
-            for key, value in platform_config.iteritems():
-                value = deepcopy(value)
-                if isinstance(value, str):
-                    value = value % locals()
-                BRANCHES[branch]['platforms'][platform][key] = value
-
-########
-# Entries in BRANCHES for tests should be a tuple of:
-# - Number of tests to run per build
-# - Whether queue merging is on
-# - TalosFactory options
-# - Which platforms to run on
-
-# Let's load the defaults
-for branch in BRANCHES.keys():
-    BRANCHES[branch]['repo_path'] = branch
-    BRANCHES[branch]['branch_name'] = branch.title()
-    BRANCHES[branch]['build_branch'] = branch.title()
-    BRANCHES[branch]['enable_unittests'] = True
-    BRANCHES[branch]['fetch_symbols'] = True
-    BRANCHES[branch]['fetch_release_symbols'] = False
-    BRANCHES[branch]['pgo_strategy'] = None
-    BRANCHES[branch]['pgo_platforms'] = []
-    BRANCHES[branch]['script_repo_manifest'] = "https://hg.mozilla.org/%(repo_path)s/raw-file/%(revision)s/" + \
-                                               "testing/mozharness/mozharness.json"
-    # mozharness_archiver_repo_path tells the factory to use a copy of mozharness from within the
-    #  gecko tree and also allows us to overwrite which gecko repo to use. Useful for platforms
-    # like Thunderbird
-    BRANCHES[branch]['mozharness_archiver_repo_path'] = '%(repo_path)s'
-
-# The following are exceptions to the defaults
-
-BRANCHES['pine']['branch_name'] = "Pine"
-BRANCHES['pine']['repo_path'] = "projects/pine"
-BRANCHES['pine']['platforms']['emulator']['ubuntu64_vm-b2g-emulator']['opt_unittest_suites'] = \
-    MOCHITEST + CRASHTEST + XPCSHELL + MARIONETTE + JSREFTEST + REFTEST_20
-BRANCHES['pine']['platforms']['emulator']['ubuntu64_vm-b2g-emulator']['debug_unittest_suites'] = \
-    MOCHITEST_EMULATOR_DEBUG[:] + REFTEST + CRASHTEST + MARIONETTE + XPCSHELL_CHUNKED
-# disabled for Bug 1150320
-# BRANCHES['jamun']['repo_path'] = "projects/jamun"
-BRANCHES['fx-team']['repo_path'] = "integration/fx-team"
-BRANCHES['mozilla-b2g44_v2_5']['repo_path'] = "releases/mozilla-b2g44_v2_5"
-BRANCHES['mozilla-central']['branch_name'] = "Firefox"
-BRANCHES['mozilla-inbound']['repo_path'] = "integration/mozilla-inbound"
-BRANCHES['try']['pgo_strategy'] = "try"
-BRANCHES['try']['enable_try'] = True
-
-# add mochitest-chrome on B2G emulators as of gecko 38
-for name, branch in items_at_least(BRANCHES, 'gecko_version', 38):
-    if nested_haskey(BRANCHES[name]['platforms'], 'emulator', 'ubuntu64_vm-b2g-emulator'):
-        BRANCHES[name]['platforms']['emulator']['ubuntu64_vm-b2g-emulator']['opt_unittest_suites'] += \
-            MOCHITEST_CHROME[:]
-
-# explicitly set slave platforms per branch
-for branch in BRANCHES.keys():
-    for platform in BRANCHES[branch]['platforms']:
-        if 'slave_platforms' not in BRANCHES[branch]['platforms'][platform]:
-            BRANCHES[branch]['platforms'][platform]['slave_platforms'] = list(PLATFORMS[platform]['slave_platforms'])
-
-
-PROJECTS = {}
-
-# Bug 1250953 - Disable ICS emulator builds/tests on trunk
-for branch in BRANCHES.keys():
-    for platform in BRANCHES[branch]['platforms'].keys():
-        if branch in ['mozilla-b2g44_v2_5', 'try']:
-            continue
-        if platform in ['emulator']:
-            del BRANCHES[branch]['platforms'][platform]
-
-if __name__ == "__main__":
-    import sys
-    import pprint
-
-    args = sys.argv[1:]
-
-    if len(args) > 0:
-        items = dict([(b, BRANCHES[b]) for b in args])
-    else:
-        items = dict(BRANCHES.iteritems())
-
-    for k, v in sorted(items.iteritems()):
-        out = pprint.pformat(v)
-        for l in out.splitlines():
-            print '%s: %s' % (k, l)
-
-    for suite in sorted(SUITES):
-        out = pprint.pformat(SUITES[suite])
-        for l in out.splitlines():
-            print '%s: %s' % (suite, l)
deleted file mode 100644
--- a/mozilla-tests/b2g_production_config.py
+++ /dev/null
@@ -1,30 +0,0 @@
-from copy import deepcopy
-
-from production_config import \
-    GLOBAL_VARS, SLAVES, TRY_SLAVES, GRAPH_CONFIG
-
-
-GLOBAL_VARS = deepcopy(GLOBAL_VARS)
-
-GLOBAL_VARS['tinderbox_tree'] = 'MozillaTest'
-GLOBAL_VARS['stage_username'] = 'ffxbld'
-GLOBAL_VARS['stage_ssh_key'] = 'ffxbld_rsa'
-
-# Local branch overrides
-BRANCHES = {
-    'try': {
-        'enable_mail_notifier': True,
-        'notify_real_author': True,
-        'enable_merging': False,
-        'slave_key': 'try_slaves',
-        'package_url': 'https://archive.mozilla.org/pub/b2g/try-builds',
-        'package_dir': '%(who)s-%(got_revision)s/',
-        'stage_username': 'trybld',
-        'stage_ssh_key': 'trybld_dsa',
-    },
-}
-
-PLATFORM_VARS = {}
-
-PROJECTS = {}
-B2G_PROJECTS = {}
deleted file mode 100644
--- a/mozilla-tests/b2g_staging_config.py
+++ /dev/null
@@ -1,25 +0,0 @@
-from copy import deepcopy
-
-from staging_config import GLOBAL_VARS, SLAVES, TRY_SLAVES
-
-GLOBAL_VARS = deepcopy(GLOBAL_VARS)
-
-GLOBAL_VARS['tinderbox_tree'] = 'MozillaTest'
-GLOBAL_VARS['stage_username'] = 'ffxbld'
-GLOBAL_VARS['stage_ssh_key'] = 'ffxbld_rsa'
-
-BRANCHES = {
-    'try': {
-        'enable_mail_notifier': False, # Set to True when testing
-        'email_override': [], # Set to your address when testing
-        'package_url': 'http://ftp.stage.mozaws.net/pub/b2g/try-builds',
-        'package_dir': '%(who)s-%(got_revision)s/',
-        'stage_username': 'trybld',
-        'stage_ssh_key': 'trybld_dsa',
-    },
-}
-
-PLATFORM_VARS = {}
-
-PROJECTS = {}
-B2G_PROJECTS = {}
--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -2919,20 +2919,18 @@ for platform in PLATFORMS.keys():
     for name, branch in items_at_least(BRANCHES, 'gecko_version', 39):
         for slave_platform in PLATFORMS[platform]['slave_platforms']:
             if slave_platform not in ['ubuntu64_vm']:
                 continue
             if platform in BRANCHES[name]['platforms']:
                 if slave_platform in BRANCHES[name]['platforms'][platform]:
                     BRANCHES[name]['platforms'][platform][slave_platform]['opt_unittest_suites'] += LUCIDDREAM
 
-# mochitest-jetpack everywhere except on versioned B2G branches
+# mochitest-jetpack everywhere
 for name, branch in items_at_least(BRANCHES, 'gecko_version', 39):
-    if name.startswith('mozilla-b2g'):
-        continue
     for pf in PLATFORMS:
         if pf not in branch['platforms']:
             continue
         for slave_pf in branch['platforms'][pf].get(
                 'slave_platforms', PLATFORMS[pf]['slave_platforms']):
             if slave_pf not in branch['platforms'][pf]:
                 continue
             branch['platforms'][pf][slave_pf]['opt_unittest_suites'] += MOCHITEST_JP
@@ -3099,18 +3097,16 @@ for name, branch in items_at_least(BRANC
 # Use 9 chunks for m-dt on branches > trunk, excluding twigs, 2 or 4 chunks elsewhere
 for branch in BRANCHES.keys():
     for platform in PLATFORMS.keys():
         if platform not in BRANCHES[branch]['platforms']:
             continue
         for slave_platform in PLATFORMS[platform]['slave_platforms']:
             if slave_platform not in BRANCHES[branch]['platforms'][platform]:
                 continue
-            if branch.startswith('mozilla-b2g'):
-                continue
             bc_suite = MOCHITEST_BC_3[:]
             dt_opt_suite = MOCHITEST_DT_2[:]
             dt_debug_suite = MOCHITEST_DT_4[:]
             gecko_version = BRANCHES[branch].get('gecko_version')
             if branch in TWIGS:
                 pass
             elif gecko_version and gecko_version != trunk_gecko_version:
                 if gecko_version > 38:
--- a/mozilla-tests/production_config.py
+++ b/mozilla-tests/production_config.py
@@ -57,24 +57,16 @@ for i in range(1, 2601):  # Bug 1252248
 
 for i in range(1, 70):
     SLAVES['ubuntu64_hw']['talos-linux64-ix-%03i' % i] = {}
 
 for i in range(1, 3):
     SLAVES['win64_vm']['tst-w64-ec2-%03i' % i] = {}
 
 SLAVES['ubuntu64-asan_vm'] = SLAVES['ubuntu64_vm']
-# Use "-b2g" suffix to make misc.py generate unique builder names
-SLAVES['ubuntu32_vm-b2gdt'] = SLAVES['ubuntu32_vm']
-SLAVES['ubuntu64_vm-b2g'] = SLAVES['ubuntu64_vm']
-SLAVES['ubuntu64_vm-b2g-emulator'] = SLAVES['ubuntu64_vm']
-SLAVES['ubuntu64_vm-b2g-lg-emulator'] = SLAVES['ubuntu64_vm_large']
-SLAVES['ubuntu64_vm-b2g-emulator-jb'] = SLAVES['ubuntu64_vm']
-SLAVES['ubuntu64_vm-b2g-emulator-kk'] = SLAVES['ubuntu64_vm']
-SLAVES['ubuntu64_hw-b2g'] = SLAVES['ubuntu64_hw']
 SLAVES['win8_64'] = SLAVES['win8']
 SLAVES['win10_64'] = SLAVES['win10']
 SLAVES['ubuntu64_vm_mobile'] = SLAVES['ubuntu64_vm']
 SLAVES['ubuntu64_vm_armv7_mobile'] = SLAVES['ubuntu64_vm']
 SLAVES['ubuntu64_vm_armv7_large'] = SLAVES['ubuntu64_vm_large']
 SLAVES['ubuntu64_vm_lnx_large'] = SLAVES['ubuntu64_vm_large']
 SLAVES['ubuntu64-asan_vm_lnx_large'] = SLAVES['ubuntu64_vm_large']
 
@@ -146,9 +138,8 @@ PLATFORM_VARS = {
 }
 
 PROJECTS = {
     'jetpack': {
         'scripts_repo': 'https://hg.mozilla.org/build/tools',
         'tinderbox_tree': 'Jetpack',
     },
 }
-B2G_PROJECTS = {}
--- a/mozilla-tests/scheduler_localconfig.py
+++ b/mozilla-tests/scheduler_localconfig.py
@@ -8,24 +8,19 @@ c['slavePortnum'] = master_config.get('p
 
 if 'ssh_port' in master_config:
     c['manhole'] = manhole.PasswordManhole(
         "tcp:%(ssh_port)i:interface=127.0.0.1" % master_config,
         "cltbld", "password")
 
 from config import BRANCHES, PLATFORMS, PROJECTS
 import thunderbird_config
-import b2g_config
-from b2g_config import PROJECTS as B2G_PROJECTS
 import mobile_config
 # Do everything!
 ACTIVE_BRANCHES = BRANCHES.keys()
 ACTIVE_THUNDERBIRD_BRANCHES = thunderbird_config.BRANCHES.keys()
-ACTIVE_B2G_BRANCHES = b2g_config.BRANCHES.keys()
 ACTIVE_MOBILE_BRANCHES = mobile_config.BRANCHES.keys()
 ACTIVE_PLATFORMS = dict((platform, None) for platform in PLATFORMS.keys())
 ACTIVE_THUNDERBIRD_PLATFORMS = dict((platform, None) for platform in thunderbird_config.PLATFORMS.keys())
-ACTIVE_B2G_PLATFORMS = dict((platform, None) for platform in b2g_config.PLATFORMS.keys())
 ACTIVE_MOBILE_PLATFORMS = dict((platform, None) for platform in mobile_config.PLATFORMS.keys())
 ACTIVE_PROJECTS = PROJECTS.keys()
-ACTIVE_B2G_PROJECTS = B2G_PROJECTS.keys()
 
 QUEUEDIR = "/dev/shm/queue"
--- a/mozilla-tests/scheduler_master.cfg
+++ b/mozilla-tests/scheduler_master.cfg
@@ -1,24 +1,22 @@
 # vim: ft=python
 from copy import deepcopy
 
 # import/reload dance so that reconfigs work
 import buildbotcustom.misc
 import master_common
 import config
 import thunderbird_config
-import b2g_config
 import mobile_config
 import master_localconfig
 reload(buildbotcustom.misc)
 reload(master_common)
 reload(config)
 reload(thunderbird_config)
-reload(b2g_config)
 reload(mobile_config)
 reload(master_localconfig)
 
 from master_common import BuildmasterConfig
 c = BuildmasterConfig
 for key, value in master_localconfig.BuildmasterConfig.iteritems():
     if key in c:
         c[key].extend(value)
@@ -30,41 +28,32 @@ for key, value in master_localconfig.Bui
 from mozilla_buildtools.queuedir import QueueDir
 commandsQueue = QueueDir('commands', '%s/commands' % master_localconfig.QUEUEDIR)
 
 from config import BRANCHES, PLATFORMS, SUITES, BRANCH_UNITTEST_VARS, PROJECTS, SLAVES
 from thunderbird_config import BRANCHES as THUNDERBIRD_BRANCHES
 from thunderbird_config import PLATFORMS as THUNDERBIRD_PLATFORMS
 from thunderbird_config import SUITES as THUNDERBIRD_SUITES
 from thunderbird_config import BRANCH_UNITTEST_VARS as THUNDERBIRD_BRANCH_UNITTEST_VARS
-from b2g_config import BRANCHES as B2G_BRANCHES
-from b2g_config import PLATFORMS as B2G_PLATFORMS
-from b2g_config import SUITES as B2G_SUITES
-from b2g_config import BRANCH_UNITTEST_VARS as B2G_BRANCH_UNITTEST_VARS
-from b2g_config import PROJECTS as B2G_PROJECTS
 from mobile_config import BRANCHES as MOBILE_BRANCHES
 from mobile_config import PLATFORMS as MOBILE_PLATFORMS
 from mobile_config import SUITES as MOBILE_SUITES
 from mobile_config import BRANCH_UNITTEST_VARS as MOBILE_BRANCH_UNITTEST_VARS
 from master_localconfig import ACTIVE_BRANCHES, ACTIVE_PLATFORMS, ACTIVE_PROJECTS, \
     ACTIVE_THUNDERBIRD_BRANCHES, ACTIVE_THUNDERBIRD_PLATFORMS, \
-    ACTIVE_B2G_BRANCHES, ACTIVE_B2G_PLATFORMS, ACTIVE_B2G_PROJECTS, \
     ACTIVE_MOBILE_BRANCHES, ACTIVE_MOBILE_PLATFORMS
 
 from buildbotcustom.misc import generateTalosBranchObjects, generateProjectObjects, mergeBuildObjects
 
 for p in ACTIVE_PLATFORMS.keys():
     ACTIVE_PLATFORMS[p] = deepcopy(PLATFORMS[p])
 
 for p in ACTIVE_THUNDERBIRD_PLATFORMS.keys():
     ACTIVE_THUNDERBIRD_PLATFORMS[p] = deepcopy(THUNDERBIRD_PLATFORMS[p])
 
-for p in ACTIVE_B2G_PLATFORMS.keys():
-    ACTIVE_B2G_PLATFORMS[p] = deepcopy(B2G_PLATFORMS[p])
-
 for p in ACTIVE_MOBILE_PLATFORMS.keys():
     ACTIVE_MOBILE_PLATFORMS[p] = deepcopy(MOBILE_PLATFORMS[p])
 
 buildObjects = {}
 
 for branch in ACTIVE_BRANCHES:
     talosObjects = generateTalosBranchObjects(branch, BRANCHES[branch],
                                               ACTIVE_PLATFORMS, SUITES,
@@ -72,39 +61,26 @@ for branch in ACTIVE_BRANCHES:
     buildObjects = mergeBuildObjects(buildObjects, talosObjects)
 
 for branch in ACTIVE_THUNDERBIRD_BRANCHES:
     talosObjects = generateTalosBranchObjects(branch, THUNDERBIRD_BRANCHES[branch],
                                               ACTIVE_THUNDERBIRD_PLATFORMS, THUNDERBIRD_SUITES,
                                               THUNDERBIRD_BRANCH_UNITTEST_VARS['platforms'])
     buildObjects = mergeBuildObjects(buildObjects, talosObjects)
 
-for branch in ACTIVE_B2G_BRANCHES:
-    talosObjects = generateTalosBranchObjects(branch, B2G_BRANCHES[branch],
-                                              ACTIVE_B2G_PLATFORMS, B2G_SUITES,
-                                              B2G_BRANCH_UNITTEST_VARS['platforms'])
-    buildObjects = mergeBuildObjects(buildObjects, talosObjects)
-
 for branch in ACTIVE_MOBILE_BRANCHES:
     talosObjects = generateTalosBranchObjects(branch, MOBILE_BRANCHES[branch],
                                               ACTIVE_MOBILE_PLATFORMS, MOBILE_SUITES,
                                               MOBILE_BRANCH_UNITTEST_VARS['platforms'])
     buildObjects = mergeBuildObjects(buildObjects, talosObjects)
 
 for project in ACTIVE_PROJECTS:
     projectObjects = generateProjectObjects(project, PROJECTS[project], SLAVES)
     buildObjects = mergeBuildObjects(buildObjects, projectObjects)
 
-for project in ACTIVE_B2G_PROJECTS:
-    projectObjects = generateProjectObjects(
-        project, B2G_PROJECTS[project], SLAVES,
-        all_builders=buildObjects['builders']
-    )
-    buildObjects = mergeBuildObjects(buildObjects, projectObjects)
-
 # We only want the schedulers and change sources
 c['schedulers'].extend(buildObjects['schedulers'])
 c['change_source'].extend(buildObjects['change_source'])
 
 # Required for sendchange
 from buildbot.changes.pb import PBChangeSource
 c['change_source'].append(PBChangeSource())
 
--- a/mozilla-tests/staging_config.py
+++ b/mozilla-tests/staging_config.py
@@ -34,9 +34,8 @@ PLATFORM_VARS = {
 }
 
 PROJECTS = {
     'jetpack': {
         'scripts_repo': 'https://hg.mozilla.org/build/tools',
         'tinderbox_tree': 'MozillaTest',
     },
 }
-B2G_PROJECTS = {}
--- a/mozilla-tests/tests_localconfig.py
+++ b/mozilla-tests/tests_localconfig.py
@@ -1,13 +1,12 @@
 from buildbot.util import json
 from buildbot.status.html import WebStatus
 from buildbot import manhole
 from thunderbird_config import PLATFORMS as THUNDERBIRD_PLATFORMS
-from b2g_config import PLATFORMS as B2G_PLATFORMS
 from mobile_config import PLATFORMS as MOBILE_PLATFORMS
 
 master_config = json.load(open('master_config.json'))
 
 c = BuildmasterConfig = {}
 c['slavePortnum'] = master_config.get('pb_port', None)
 c['status'] = []
 
@@ -18,44 +17,32 @@ if 'http_port' in master_config:
 
 if 'ssh_port' in master_config:
     c['manhole'] = manhole.PasswordManhole(
         "tcp:%(ssh_port)i:interface=127.0.0.1" % master_config,
         "cltbld", "password")
 
 from config import BRANCHES, PLATFORMS, PROJECTS
 import thunderbird_config
-import b2g_config
-from b2g_config import PROJECTS as B2G_PROJECTS
 import mobile_config
 # Do everything!
 ACTIVE_BRANCHES = BRANCHES.keys()
 ACTIVE_THUNDERBIRD_BRANCHES = thunderbird_config.BRANCHES.keys()
-ACTIVE_B2G_BRANCHES = b2g_config.BRANCHES.keys()
 ACTIVE_MOBILE_BRANCHES = mobile_config.BRANCHES.keys()
 if 'limit_fx_platforms' in master_config:
     ACTIVE_PLATFORMS = dict((p, None) for p in master_config['limit_fx_platforms'])
 else:
     ACTIVE_PLATFORMS = dict((k, None) for k in PLATFORMS.keys())
 if 'limit_fx_slave_platforms' in master_config:
     ACTIVE_FX_SLAVE_PLATFORMS = master_config['limit_fx_slave_platforms']
 else:
     ACTIVE_FX_SLAVE_PLATFORMS = {}
 if 'limit_tb_platforms' in master_config:
     ACTIVE_THUNDERBIRD_PLATFORMS = dict((p, None) for p in master_config['limit_tb_platforms'])
 else:
     ACTIVE_THUNDERBIRD_PLATFORMS = dict((k, None) for k in THUNDERBIRD_PLATFORMS.keys())
-if 'limit_b2g_platforms' in master_config:
-    ACTIVE_B2G_PLATFORMS = dict((p, None) for p in master_config['limit_b2g_platforms'])
-else:
-    ACTIVE_B2G_PLATFORMS = dict((k, None) for k in B2G_PLATFORMS.keys())
-if 'limit_b2g_slave_platforms' in master_config:
-    ACTIVE_B2G_SLAVE_PLATFORMS = master_config['limit_b2g_slave_platforms']
-else:
-    ACTIVE_B2G_SLAVE_PLATFORMS = {}
 if 'limit_mobile_platforms' in master_config:
     ACTIVE_MOBILE_PLATFORMS = dict((p, None) for p in master_config['limit_mobile_platforms'])
 else:
     ACTIVE_MOBILE_PLATFORMS = dict((k, None) for k in MOBILE_PLATFORMS.keys())
 ACTIVE_PROJECTS = PROJECTS.keys()
-ACTIVE_B2G_PROJECTS = B2G_PROJECTS.keys()
 
 QUEUEDIR = master_config.get("queuedir", "/dev/shm/queue")
--- a/mozilla-tests/tests_master.cfg
+++ b/mozilla-tests/tests_master.cfg
@@ -4,25 +4,23 @@ import sys
 from copy import deepcopy
 
 # import/reload dance so that reconfigs work
 import buildbotcustom.misc
 import buildbotcustom.status.queued_command
 import master_common
 import config
 import thunderbird_config
-import b2g_config
 import mobile_config
 import master_localconfig
 reload(buildbotcustom.misc)
 reload(buildbotcustom.status.queued_command)
 reload(master_common)
 reload(config)
 reload(thunderbird_config)
-reload(b2g_config)
 reload(mobile_config)
 reload(master_localconfig)
 
 from master_common import BuildmasterConfig
 c = BuildmasterConfig
 for key, value in master_localconfig.BuildmasterConfig.iteritems():
     if key in c:
         c[key].extend(value)
@@ -39,30 +37,24 @@ c['status'].append(QueuedCommandHandler(
     queuedir=commandsQueue,
 ))
 
 from config import BRANCHES, PLATFORMS, SUITES, BRANCH_UNITTEST_VARS, SLAVES, TRY_SLAVES, PROJECTS
 from thunderbird_config import BRANCHES as THUNDERBIRD_BRANCHES
 from thunderbird_config import PLATFORMS as THUNDERBIRD_PLATFORMS
 from thunderbird_config import SUITES as THUNDERBIRD_SUITES
 from thunderbird_config import BRANCH_UNITTEST_VARS as THUNDERBIRD_BRANCH_UNITTEST_VARS
-from b2g_config import BRANCHES as B2G_BRANCHES
-from b2g_config import PLATFORMS as B2G_PLATFORMS
-from b2g_config import SUITES as B2G_SUITES
-from b2g_config import BRANCH_UNITTEST_VARS as B2G_BRANCH_UNITTEST_VARS
-from b2g_config import PROJECTS as B2G_PROJECTS
 from mobile_config import BRANCHES as MOBILE_BRANCHES
 from mobile_config import PLATFORMS as MOBILE_PLATFORMS
 from mobile_config import SUITES as MOBILE_SUITES
 from mobile_config import BRANCH_UNITTEST_VARS as MOBILE_BRANCH_UNITTEST_VARS
 from master_localconfig import ACTIVE_BRANCHES, ACTIVE_PLATFORMS, ACTIVE_PROJECTS, \
     ACTIVE_THUNDERBIRD_BRANCHES, ACTIVE_THUNDERBIRD_PLATFORMS, \
-    ACTIVE_B2G_BRANCHES, ACTIVE_B2G_PLATFORMS, ACTIVE_B2G_PROJECTS, \
     ACTIVE_MOBILE_BRANCHES, ACTIVE_MOBILE_PLATFORMS, \
-    ACTIVE_FX_SLAVE_PLATFORMS, ACTIVE_B2G_SLAVE_PLATFORMS
+    ACTIVE_FX_SLAVE_PLATFORMS
 
 import BuildSlaves
 reload(BuildSlaves)
 from BuildSlaves import SlavePasswords
 from buildbot.buildslave import BuildSlave
 
 # Handle active platforms - Firefox
 all_slave_platforms = []
@@ -89,64 +81,44 @@ for p in ACTIVE_PLATFORMS.keys():
 # Handle active platforms - Thunderbird
 tb_all_slave_platforms = []
 for p in ACTIVE_THUNDERBIRD_PLATFORMS.keys():
     #XXX we shouldn't have to filter these platforms
     if p in THUNDERBIRD_PLATFORMS:
         ACTIVE_THUNDERBIRD_PLATFORMS[p] = deepcopy(THUNDERBIRD_PLATFORMS[p])
         tb_all_slave_platforms.extend(THUNDERBIRD_PLATFORMS[p]['slave_platforms'])
 
-# Handle active platforms - B2G
-b2g_all_slave_platforms = []
-for p in ACTIVE_B2G_PLATFORMS.keys():
-    #XXX we shouldn't have to filter these platforms
-    if p in B2G_PLATFORMS:
-        ACTIVE_B2G_PLATFORMS[p] = deepcopy(B2G_PLATFORMS[p])
-        # Handle active slave platforms
-        if p in ACTIVE_B2G_SLAVE_PLATFORMS:
-            for sp in ACTIVE_B2G_PLATFORMS[p]['slave_platforms'][:]:
-                if sp not in ACTIVE_B2G_SLAVE_PLATFORMS[p]:
-                    ACTIVE_B2G_PLATFORMS[p]['slave_platforms'].remove(sp)
-        b2g_all_slave_platforms.extend(B2G_PLATFORMS[p]['slave_platforms'])
-
 # Handle active platforms - MOBILE
 mobile_all_slave_platforms = []
 for p in ACTIVE_MOBILE_PLATFORMS.keys():
     #XXX we shouldn't have to filter these platforms
     if p in MOBILE_PLATFORMS:
         ACTIVE_MOBILE_PLATFORMS[p] = deepcopy(MOBILE_PLATFORMS[p])
         mobile_all_slave_platforms.extend(MOBILE_PLATFORMS[p]['slave_platforms'])
 
 # Remove non-active platform entries for projects - Firefox only
 for p in PROJECTS:
     if 'platforms' in PROJECTS[p]:
         for project_slave_platform in PROJECTS[p]['platforms'].keys():
             if project_slave_platform not in all_slave_platforms:
                 del PROJECTS[p]['platforms'][project_slave_platform]
 
-# Remove non-active platform entries for projects - B2G only
-for p in B2G_PROJECTS:
-    if 'platforms' in B2G_PROJECTS[p]:
-        for project_slave_platform in B2G_PROJECTS[p]['platforms'].keys():
-            if project_slave_platform not in b2g_all_slave_platforms:
-                del B2G_PROJECTS[p]['platforms'][project_slave_platform]
-
 for slave_platform, slaves in SLAVES.iteritems():
     # If this platform isn't active, skip it!
-    if slave_platform not in all_slave_platforms + tb_all_slave_platforms + b2g_all_slave_platforms + mobile_all_slave_platforms:
+    if slave_platform not in all_slave_platforms + tb_all_slave_platforms + mobile_all_slave_platforms:
         continue
     for name in sorted(slaves.keys()):
         c['slaves'].append(BuildSlave(name, SlavePasswords[slave_platform], max_builds=1,
                                       properties=slaves[name]))
 
 # I have no idea why this block exists - bhearsum
 if 'try' in ACTIVE_BRANCHES:
     for slave_platform, slaves in TRY_SLAVES.iteritems():
         # If this platform isn't active, skip it!
-        if slave_platform not in all_slave_platforms + tb_all_slave_platforms + b2g_all_slave_platforms + mobile_all_slave_platforms:
+        if slave_platform not in all_slave_platforms + tb_all_slave_platforms + mobile_all_slave_platforms:
             continue
         for name in sorted(slaves.keys()):
             c['slaves'].append(BuildSlave(name, SlavePasswords[slave_platform], max_builds=1,
                                           properties=slaves[name]))
 
 from buildbotcustom.misc import generateTalosBranchObjects, generateProjectObjects, \
     mergeBuildObjects
 
@@ -162,41 +134,27 @@ for branch in ACTIVE_BRANCHES:
 
 for branch in ACTIVE_THUNDERBIRD_BRANCHES:
     talosObjects = generateTalosBranchObjects(branch, THUNDERBIRD_BRANCHES[branch],
                                               ACTIVE_THUNDERBIRD_PLATFORMS,
                                               THUNDERBIRD_BRANCHES[branch].get('suites', THUNDERBIRD_SUITES),
                                               THUNDERBIRD_BRANCH_UNITTEST_VARS['platforms'])
     buildObjects = mergeBuildObjects(buildObjects, talosObjects)
 
-for branch in ACTIVE_B2G_BRANCHES:
-    talosObjects = generateTalosBranchObjects(branch, B2G_BRANCHES[branch],
-                                              ACTIVE_B2G_PLATFORMS,
-                                              B2G_BRANCHES[branch].get('suites', B2G_SUITES),
-                                              B2G_BRANCH_UNITTEST_VARS['platforms'])
-    buildObjects = mergeBuildObjects(buildObjects, talosObjects)
-
 for branch in ACTIVE_MOBILE_BRANCHES:
     talosObjects = generateTalosBranchObjects(branch, MOBILE_BRANCHES[branch],
                                               ACTIVE_MOBILE_PLATFORMS,
                                               MOBILE_BRANCHES[branch].get('suites', MOBILE_SUITES),
                                               MOBILE_BRANCH_UNITTEST_VARS['platforms'])
     buildObjects = mergeBuildObjects(buildObjects, talosObjects)
 
 for project in ACTIVE_PROJECTS:
     projectObjects = generateProjectObjects(project, PROJECTS[project], SLAVES)
     buildObjects = mergeBuildObjects(buildObjects, projectObjects)
 
-for project in ACTIVE_B2G_PROJECTS:
-    projectObjects = generateProjectObjects(
-        project, B2G_PROJECTS[project], SLAVES,
-        all_builders=buildObjects['builders']
-    )
-    buildObjects = mergeBuildObjects(buildObjects, projectObjects)
-
 # We only want builders, status objects
 c['builders'].extend(buildObjects['builders'])
 c['status'].extend(buildObjects['status'])
 # We need just the triggerable schedulers here
 for s in buildObjects['schedulers']:
     if isinstance(s, Triggerable):
         c['schedulers'].append(s)
 
--- a/mozilla-tests/thunderbird_production_config.py
+++ b/mozilla-tests/thunderbird_production_config.py
@@ -37,9 +37,8 @@ BRANCHES = {
         'stage_username': 'tbirdbld',
         'stage_ssh_key': 'tbirdbld_dsa',
     },
 }
 
 PLATFORM_VARS = {}
 
 PROJECTS = {}
-B2G_PROJECTS = {}
--- a/mozilla-tests/thunderbird_staging_config.py
+++ b/mozilla-tests/thunderbird_staging_config.py
@@ -17,9 +17,8 @@ BRANCHES = {
             'stage_username': 'tbirdbld',
             'stage_ssh_key': 'tbirdbld_dsa',
     },
 }
 
 PLATFORM_VARS = {}
 
 PROJECTS = {}
-B2G_PROJECTS = {}
--- a/mozilla-tests/universal_master_sqlite.cfg
+++ b/mozilla-tests/universal_master_sqlite.cfg
@@ -4,25 +4,23 @@ import sys
 from copy import deepcopy
 
 # import/reload dance so that reconfigs work
 import buildbotcustom.misc
 import buildbotcustom.status.queued_command
 import master_common
 import config
 import thunderbird_config
-import b2g_config
 import mobile_config
 import master_localconfig
 reload(buildbotcustom.misc)
 reload(buildbotcustom.status.queued_command)
 reload(master_common)
 reload(config)
 reload(thunderbird_config)
-reload(b2g_config)
 reload(mobile_config)
 reload(master_localconfig)
 
 from master_common import BuildmasterConfig
 c = BuildmasterConfig
 for key, value in master_localconfig.BuildmasterConfig.iteritems():
     if key in c:
         c[key].extend(value)
@@ -39,30 +37,24 @@ c['status'].append(QueuedCommandHandler(
     queuedir=commandsQueue,
 ))
 
 from config import BRANCHES, PLATFORMS, SUITES, BRANCH_UNITTEST_VARS, SLAVES, TRY_SLAVES, PROJECTS
 from thunderbird_config import BRANCHES as THUNDERBIRD_BRANCHES
 from thunderbird_config import PLATFORMS as THUNDERBIRD_PLATFORMS
 from thunderbird_config import BRANCH_UNITTEST_VARS as THUNDERBIRD_BRANCH_UNITTEST_VARS
 from thunderbird_config import SUITES as THUNDERBIRD_SUITES
-from b2g_config import BRANCHES as B2G_BRANCHES
-from b2g_config import PLATFORMS as B2G_PLATFORMS
-from b2g_config import BRANCH_UNITTEST_VARS as B2G_BRANCH_UNITTEST_VARS
-from b2g_config import SUITES as B2G_SUITES
-from b2g_config import PROJECTS as B2G_PROJECTS
 from mobile_config import BRANCHES as MOBILE_BRANCHES
 from mobile_config import PLATFORMS as MOBILE_PLATFORMS
 from mobile_config import BRANCH_UNITTEST_VARS as MOBILE_BRANCH_UNITTEST_VARS
 from mobile_config import SUITES as MOBILE_SUITES
 from master_localconfig import ACTIVE_BRANCHES, ACTIVE_PLATFORMS, ACTIVE_PROJECTS, \
     ACTIVE_THUNDERBIRD_BRANCHES, ACTIVE_THUNDERBIRD_PLATFORMS, \
-    ACTIVE_B2G_BRANCHES, ACTIVE_B2G_PLATFORMS, ACTIVE_B2G_PROJECTS, \
     ACTIVE_MOBILE_BRANCHES, ACTIVE_MOBILE_PLATFORMS, \
-    ACTIVE_FX_SLAVE_PLATFORMS, ACTIVE_B2G_SLAVE_PLATFORMS
+    ACTIVE_FX_SLAVE_PLATFORMS
 
 import BuildSlaves
 reload(BuildSlaves)
 from BuildSlaves import SlavePasswords
 from buildbot.buildslave import BuildSlave
 
 # Handle active platforms - Firefox
 all_slave_platforms = []
@@ -89,63 +81,43 @@ for p in ACTIVE_PLATFORMS.keys():
 # Handle active platforms - Thunderbird
 tb_all_slave_platforms = []
 for p in ACTIVE_THUNDERBIRD_PLATFORMS.keys():
     #XXX we shouldn't have to filter these platforms
     if p in THUNDERBIRD_PLATFORMS:
         ACTIVE_THUNDERBIRD_PLATFORMS[p] = deepcopy(THUNDERBIRD_PLATFORMS[p])
         tb_all_slave_platforms.extend(THUNDERBIRD_PLATFORMS[p]['slave_platforms'])
 
-# Handle active platforms - B2G
-b2g_all_slave_platforms = []
-for p in ACTIVE_B2G_PLATFORMS.keys():
-    #XXX we shouldn't have to filter these platforms
-    if p in B2G_PLATFORMS:
-        ACTIVE_B2G_PLATFORMS[p] = deepcopy(B2G_PLATFORMS[p])
-        # Handle active slave platforms
-        if p in ACTIVE_B2G_SLAVE_PLATFORMS:
-            for sp in ACTIVE_B2G_PLATFORMS[p]['slave_platforms'][:]:
-                if sp not in ACTIVE_B2G_SLAVE_PLATFORMS[p]:
-                    ACTIVE_B2G_PLATFORMS[p]['slave_platforms'].remove(sp)
-        b2g_all_slave_platforms.extend(B2G_PLATFORMS[p]['slave_platforms'])
-
 # Handle active platforms - MOBILE
 mobile_all_slave_platforms = []
 for p in ACTIVE_MOBILE_PLATFORMS.keys():
     #XXX we shouldn't have to filter these platforms
     if p in MOBILE_PLATFORMS:
         ACTIVE_MOBILE_PLATFORMS[p] = deepcopy(MOBILE_PLATFORMS[p])
         mobile_all_slave_platforms.extend(MOBILE_PLATFORMS[p]['slave_platforms'])
 
 # Remove non-active platform entries for projects
 for p in PROJECTS:
     if 'platforms' in PROJECTS[p]:
         for project_slave_platform in PROJECTS[p]['platforms'].keys():
             if project_slave_platform not in all_slave_platforms:
                 del PROJECTS[p]['platforms'][project_slave_platform]
 
-# Remove non-active platform entries for projects
-for p in B2G_PROJECTS:
-    if 'platforms' in B2G_PROJECTS[p]:
-        for project_slave_platform in B2G_PROJECTS[p]['platforms'].keys():
-            if project_slave_platform not in b2g_all_slave_platforms:
-                del B2G_PROJECTS[p]['platforms'][project_slave_platform]
-
 for slave_platform, slaves in SLAVES.iteritems():
     # If this platform isn't active, skip it!
-    if slave_platform not in all_slave_platforms + tb_all_slave_platforms + b2g_all_slave_platforms + mobile_all_slave_platforms:
+    if slave_platform not in all_slave_platforms + tb_all_slave_platforms + mobile_all_slave_platforms:
         continue
     for name in sorted(slaves.keys()):
         c['slaves'].append(BuildSlave(name, SlavePasswords.get(slave_platform, "pass"), max_builds=1,
                                       properties=slaves[name]))
 
 if 'try' in ACTIVE_BRANCHES:
     for slave_platform, slaves in TRY_SLAVES.iteritems():
         # If this platform isn't active, skip it!
-        if slave_platform not in all_slave_platforms + tb_all_slave_platforms + b2g_all_slave_platforms + mobile_all_slave_platforms:
+        if slave_platform not in all_slave_platforms + tb_all_slave_platforms + mobile_all_slave_platforms:
             continue
         for name in sorted(slaves.keys()):
             c['slaves'].append(BuildSlave(name, SlavePasswords.get(slave_platform, "pass"), max_builds=1,
                                           properties=slaves[name]))
 
 from buildbotcustom.misc import generateTalosBranchObjects, generateProjectObjects, \
     mergeBuildObjects
 
@@ -159,41 +131,27 @@ for branch in ACTIVE_BRANCHES:
 
 for branch in ACTIVE_THUNDERBIRD_BRANCHES:
     talosObjects = generateTalosBranchObjects(branch, THUNDERBIRD_BRANCHES[branch],
                                               ACTIVE_THUNDERBIRD_PLATFORMS,
                                               THUNDERBIRD_BRANCHES[branch].get('suites', THUNDERBIRD_SUITES),
                                               THUNDERBIRD_BRANCH_UNITTEST_VARS['platforms'])
     buildObjects = mergeBuildObjects(buildObjects, talosObjects)
 
-for branch in ACTIVE_B2G_BRANCHES:
-    talosObjects = generateTalosBranchObjects(branch, B2G_BRANCHES[branch],
-                                              ACTIVE_B2G_PLATFORMS,
-                                              B2G_BRANCHES[branch].get('suites', B2G_SUITES),
-                                              B2G_BRANCH_UNITTEST_VARS['platforms'])
-    buildObjects = mergeBuildObjects(buildObjects, talosObjects)
-
 for branch in ACTIVE_MOBILE_BRANCHES:
     talosObjects = generateTalosBranchObjects(branch, MOBILE_BRANCHES[branch],
                                               ACTIVE_MOBILE_PLATFORMS,
                                               MOBILE_BRANCHES[branch].get('suites', MOBILE_SUITES),
                                               MOBILE_BRANCH_UNITTEST_VARS['platforms'])
     buildObjects = mergeBuildObjects(buildObjects, talosObjects)
 
 for project in ACTIVE_PROJECTS:
     projectObjects = generateProjectObjects(project, PROJECTS[project], SLAVES)
     buildObjects = mergeBuildObjects(buildObjects, projectObjects)
 
-for project in ACTIVE_B2G_PROJECTS:
-    projectObjects = generateProjectObjects(
-        project, B2G_PROJECTS[project], SLAVES,
-        all_builders=buildObjects['builders']
-    )
-    buildObjects = mergeBuildObjects(buildObjects, projectObjects)
-
 c['builders'].extend(buildObjects['builders'])
 c['status'].extend(buildObjects['status'])
 c['schedulers'].extend(buildObjects['schedulers'])
 c['change_source'].extend(buildObjects['change_source'])
 
 # Required for sendchange
 from buildbot.changes.pb import PBChangeSource
 c['change_source'].append(PBChangeSource())
deleted file mode 100644
--- a/mozilla/b2g_config.py
+++ /dev/null
@@ -1,925 +0,0 @@
-from copy import deepcopy
-
-from config import GLOBAL_VARS, PLATFORM_VARS, SLAVES, TRY_SLAVES
-
-import b2g_project_branches
-reload(b2g_project_branches)
-from b2g_project_branches import PROJECT_BRANCHES, ACTIVE_PROJECT_BRANCHES
-
-# Note that b2g_localconfig.py is symlinked to one of:
-# {production,staging}_b2g_config.py
-import b2g_localconfig
-reload(b2g_localconfig)
-
-import master_common
-reload(master_common)
-from master_common import items_before, setMainFirefoxVersions, items_at_least
-
-GLOBAL_VARS = deepcopy(GLOBAL_VARS)
-PLATFORM_VARS = deepcopy(PLATFORM_VARS)
-
-GLOBAL_VARS.update(b2g_localconfig.GLOBAL_VARS.copy())
-
-GLOBAL_VARS.update({
-    'platforms': {
-        'nexus-4': {},
-        'nexus-4_eng': {},
-        'nexus-5-l': {},
-        'nexus-5-l_eng': {},
-        'emulator': {},
-        'emulator-debug': {},
-        'flame-kk': {},
-        'flame-kk_eng': {},
-        'flame-kk_eng-debug': {},
-    },
-    'enable_nightly': True,
-    'enable_l10n': False,
-    'enabled_products': ['b2g', 'graphene', 'horizon'],
-    'product_prefix': 'b2g',
-    'unittest_suites': [],
-    # XXX: this seems like it should be at the platform level
-    'enable_multi_locale': True,
-})
-
-# shorthand, because these are used often
-OBJDIR = GLOBAL_VARS['objdir']
-SYMBOL_SERVER_PATH = GLOBAL_VARS['symbol_server_path']
-SYMBOL_SERVER_POST_UPLOAD_CMD = GLOBAL_VARS['symbol_server_post_upload_cmd']
-builder_prefix = "b2g"
-gaia_repo = 'integration/gaia-central'
-gaia_revision_file = 'b2g/config/gaia.json'
-
-GLOBAL_ENV = {
-    'MOZ_CRASHREPORTER_NO_REPORT': '1',
-    'TINDERBOX_OUTPUT': '1',
-    'MOZ_AUTOMATION': '1',
-}
-
-PLATFORM_VARS = {
-    'nexus-4': {
-        'mozharness_config': {
-            'script_name': 'scripts/b2g_build.py',
-            # b2g_build.py will checkout gecko from hg and look up a tooltool manifest given by the
-            # --target name below
-            'extra_args': ['--target', 'nexus-4', '--config', 'b2g/releng-private-updates.py',
-                           '--gaia-languages-file', 'locales/languages_dev.json',
-                           '--gecko-languages-file', 'gecko/b2g/locales/all-locales',
-                           '--config', GLOBAL_VARS['mozharness_configs']['balrog']],
-            'reboot_command': ['bash', '-c', 'sudo reboot; sleep 600'],
-            'mozharness_repo_cache': '/tools/checkouts/mozharness',
-            'tools_repo_cache': '/tools/checkouts/build-tools',
-        },
-        'env': {
-            'PATH': '/tools/python27-mercurial/bin:/tools/python27/bin:/usr/local/bin:/usr/lib64/ccache:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/home/cltbld/bin',
-            'PYTHONPATH': '/tools/python27/lib',
-            'HG_SHARE_BASE_DIR': '/builds/hg-shared',
-        },
-        'stage_product': 'b2g',
-        'product_name': 'b2g',
-        'base_name': builder_prefix + '_%(branch)s_%(platform)s',
-        'slaves': SLAVES['mock'],
-        'enable_periodic': True,
-        'enable_dep': False,
-    },
-    'nexus-4_eng': {
-        'mozharness_config': {
-            'script_name': 'scripts/b2g_build.py',
-            # b2g_build.py will checkout gecko from hg and look up a tooltool manifest given by the
-            # --target name below
-            'extra_args': ['--target', 'nexus-4', '--config', 'b2g/releng-otoro-eng.py',
-                           '--gaia-languages-file', 'locales/languages_dev.json',
-                           '--gecko-languages-file', 'gecko/b2g/locales/all-locales'],
-            'reboot_command': ['bash', '-c', 'sudo reboot; sleep 600'],
-            'mozharness_repo_cache': '/tools/checkouts/mozharness',
-            'tools_repo_cache': '/tools/checkouts/build-tools',
-        },
-        'env': {
-            'PATH': '/tools/python27-mercurial/bin:/tools/python27/bin:/usr/local/bin:/usr/lib64/ccache:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/home/cltbld/bin',
-            'PYTHONPATH': '/tools/python27/lib',
-            'HG_SHARE_BASE_DIR': '/builds/hg-shared',
-        },
-        'stage_product': 'b2g',
-        'product_name': 'b2g',
-        'base_name': builder_prefix + '_%(branch)s_%(platform)s',
-        'slaves': SLAVES['mock'],
-        'enable_periodic': True,
-        'enable_dep': False,
-    },
-    'nexus-5-l': {
-        'mozharness_config': {
-            'script_name': 'scripts/b2g_build.py',
-            # b2g_build.py will checkout gecko from hg and look up a tooltool manifest given by the
-            # --target name below
-            'extra_args': ['--target', 'nexus-5-l', '--config', 'b2g/releng-private-updates.py',
-                           '--gaia-languages-file', 'locales/languages_dev.json',
-                           '--gecko-languages-file', 'gecko/b2g/locales/all-locales',
-                           '--config', GLOBAL_VARS['mozharness_configs']['balrog']],
-            'reboot_command': ['bash', '-c', 'sudo reboot; sleep 600'],
-            'mozharness_repo_cache': '/tools/checkouts/mozharness',
-            'tools_repo_cache': '/tools/checkouts/build-tools',
-        },
-        'env': {
-            'PATH': '/tools/python27-mercurial/bin:/tools/python27/bin:/usr/local/bin:/usr/lib64/ccache:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/home/cltbld/bin',
-            'PYTHONPATH': '/tools/python27/lib',
-            'HG_SHARE_BASE_DIR': '/builds/hg-shared',
-        },
-        'stage_product': 'b2g',
-        'product_name': 'b2g',
-        'base_name': builder_prefix + '_%(branch)s_%(platform)s',
-        'slaves': SLAVES['mock'],
-        'enable_periodic': True,
-        'enable_dep': False,
-    },
-    'nexus-5-l_eng': {
-        'mozharness_config': {
-            'script_name': 'scripts/b2g_build.py',
-            # b2g_build.py will checkout gecko from hg and look up a tooltool manifest given by the
-            # --target name below
-            'extra_args': ['--target', 'nexus-5-l', '--config', 'b2g/releng-otoro-eng.py',
-                           '--gaia-languages-file', 'locales/languages_dev.json',
-                           '--gecko-languages-file', 'gecko/b2g/locales/all-locales'],
-            'reboot_command': ['bash', '-c', 'sudo reboot; sleep 600'],
-            'mozharness_repo_cache': '/tools/checkouts/mozharness',
-            'tools_repo_cache': '/tools/checkouts/build-tools',
-        },
-        'env': {
-            'PATH': '/tools/python27-mercurial/bin:/tools/python27/bin:/usr/local/bin:/usr/lib64/ccache:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/home/cltbld/bin',
-            'PYTHONPATH': '/tools/python27/lib',
-            'HG_SHARE_BASE_DIR': '/builds/hg-shared',
-        },
-        'stage_product': 'b2g',
-        'product_name': 'b2g',
-        'base_name': builder_prefix + '_%(branch)s_%(platform)s',
-        'slaves': SLAVES['mock'],
-        'enable_periodic': True,
-        'enable_dep': False,
-    },
-    'emulator': {
-        'mozharness_config': {
-            'script_name': 'scripts/b2g_build.py',
-            # b2g_build.py will checkout gecko from hg and look up a tooltool manifest given by the
-            # --target name below
-            'extra_args': ['--target', 'emulator', '--config', 'b2g/releng-emulator.py',
-                           '--gaia-languages-file', 'locales/languages_dev.json',
-                           '--gecko-languages-file', 'gecko/b2g/locales/all-locales'],
-            'reboot_command': ['bash', '-c', 'sudo reboot; sleep 600'],
-            'mozharness_repo_cache': '/tools/checkouts/mozharness',
-            'tools_repo_cache': '/tools/checkouts/build-tools',
-        },
-        'env': {
-            'HG_SHARE_BASE_DIR': '/builds/hg-shared',
-        },
-        'stage_product': 'b2g',
-        'product_name': 'b2g',
-        'base_name': builder_prefix + '_%(branch)s_%(platform)s',
-        'slaves': SLAVES['mock'],
-        'try_by_default': False,
-        'maxTime': 6 * 3600,
-    },
-    'emulator-debug': {
-        'mozharness_config': {
-            'script_name': 'scripts/b2g_build.py',
-            # b2g_build.py will checkout gecko from hg and look up a tooltool manifest given by the
-            # --target name below
-            'extra_args': ['--target', 'emulator', '--config', 'b2g/releng-emulator.py',
-                           '--debug',
-                           '--gaia-languages-file', 'locales/languages_dev.json',
-                           '--gecko-languages-file', 'gecko/b2g/locales/all-locales'],
-            'reboot_command': ['bash', '-c', 'sudo reboot; sleep 600'],
-            'mozharness_repo_cache': '/tools/checkouts/mozharness',
-            'tools_repo_cache': '/tools/checkouts/build-tools',
-        },
-        'env': {
-            'HG_SHARE_BASE_DIR': '/builds/hg-shared',
-        },
-        'stage_product': 'b2g',
-        'product_name': 'b2g',
-        'base_name': builder_prefix + '_%(branch)s_%(platform)s',
-        'slaves': SLAVES['mock'],
-        'try_by_default': False,
-        'maxTime': 6 * 3600,
-    },
-    'emulator-jb': {
-        'mozharness_config': {
-            'script_name': 'scripts/b2g_build.py',
-            # b2g_build.py will checkout gecko from hg and look up a tooltool manifest given by the
-            # --target name below
-            'extra_args': ['--target', 'emulator-jb', '--config', 'b2g/releng-emulator.py',
-                           '--gaia-languages-file', 'locales/languages_dev.json',
-                           '--gecko-languages-file', 'gecko/b2g/locales/all-locales'],
-            'reboot_command': ['bash', '-c', 'sudo reboot; sleep 600'],
-            'mozharness_repo_cache': '/tools/checkouts/mozharness',
-            'tools_repo_cache': '/tools/checkouts/build-tools',
-        },
-        'env': {
-            'HG_SHARE_BASE_DIR': '/builds/hg-shared',
-        },
-        'stage_product': 'b2g',
-        'product_name': 'b2g',
-        'base_name': builder_prefix + '_%(branch)s_%(platform)s',
-        'slaves': SLAVES['mock'],
-        'enable_periodic': False,
-        'enable_dep': True,
-        'maxTime': 6 * 3600,
-    },
-    'emulator-jb-debug': {
-        'mozharness_config': {
-            'script_name': 'scripts/b2g_build.py',
-            # b2g_build.py will checkout gecko from hg and look up a tooltool manifest given by the
-            # --target name below
-            'extra_args': ['--target', 'emulator-jb', '--config', 'b2g/releng-emulator.py',
-                           '--debug',
-                           '--gaia-languages-file', 'locales/languages_dev.json',
-                           '--gecko-languages-file', 'gecko/b2g/locales/all-locales'],
-            'reboot_command': ['bash', '-c', 'sudo reboot; sleep 600'],
-            'mozharness_repo_cache': '/tools/checkouts/mozharness',
-            'tools_repo_cache': '/tools/checkouts/build-tools',
-        },
-        'env': {
-            'HG_SHARE_BASE_DIR': '/builds/hg-shared',
-        },
-        'stage_product': 'b2g',
-        'product_name': 'b2g',
-        'base_name': builder_prefix + '_%(branch)s_%(platform)s',
-        'slaves': SLAVES['mock'],
-        'enable_periodic': True,
-        'enable_dep': False,
-        'maxTime': 6 * 3600,
-    },
-    'emulator-kk': {
-        'mozharness_config': {
-            'script_name': 'scripts/b2g_build.py',
-            # b2g_build.py will checkout gecko from hg and look up a tooltool manifest given by the
-            # --target name below
-            'extra_args': ['--target', 'emulator-kk', '--config', 'b2g/releng-emulator.py',
-                           '--gaia-languages-file', 'locales/languages_dev.json',
-                           '--gecko-languages-file', 'gecko/b2g/locales/all-locales'],
-            'reboot_command': ['bash', '-c', 'sudo reboot; sleep 600'],
-            'mozharness_repo_cache': '/tools/checkouts/mozharness',
-            'tools_repo_cache': '/tools/checkouts/build-tools',
-        },
-        'env': {
-            'HG_SHARE_BASE_DIR': '/builds/hg-shared',
-        },
-        'stage_product': 'b2g',
-        'product_name': 'b2g',
-        'base_name': builder_prefix + '_%(branch)s_%(platform)s',
-        'slaves': SLAVES['mock'],
-        'enable_periodic': True,
-        'enable_dep': False,
-        'maxTime': 6 * 3600,
-    },
-    'emulator-kk-debug': {
-        'mozharness_config': {
-            'script_name': 'scripts/b2g_build.py',
-            # b2g_build.py will checkout gecko from hg and look up a tooltool manifest given by the
-            # --target name below
-            'extra_args': ['--target', 'emulator-kk', '--config', 'b2g/releng-emulator.py',
-                           '--debug',
-                           '--gaia-languages-file', 'locales/languages_dev.json',
-                           '--gecko-languages-file', 'gecko/b2g/locales/all-locales'],
-            'reboot_command': ['bash', '-c', 'sudo reboot; sleep 600'],
-            'mozharness_repo_cache': '/tools/checkouts/mozharness',
-            'tools_repo_cache': '/tools/checkouts/build-tools',
-        },
-        'env': {
-            'HG_SHARE_BASE_DIR': '/builds/hg-shared',
-        },
-        'stage_product': 'b2g',
-        'product_name': 'b2g',
-        'base_name': builder_prefix + '_%(branch)s_%(platform)s',
-        'slaves': SLAVES['mock'],
-        'enable_periodic': True,
-        'enable_dep': False,
-        'maxTime': 6 * 3600,
-    },
-    'emulator-l': {
-        'mozharness_config': {
-            'script_name': 'scripts/b2g_build.py',
-            # b2g_build.py will checkout gecko from hg and look up a tooltool manifest given by the
-            # --target name below
-            'extra_args': ['--target', 'emulator-l', '--config', 'b2g/releng-emulator.py',
-                           '--gaia-languages-file', 'locales/languages_dev.json',
-                           '--gecko-languages-file', 'gecko/b2g/locales/all-locales'],
-            'reboot_command': ['bash', '-c', 'sudo reboot; sleep 600'],
-            'mozharness_repo_cache': '/tools/checkouts/mozharness',
-            'tools_repo_cache': '/tools/checkouts/build-tools',
-        },
-        'env': {
-            'HG_SHARE_BASE_DIR': '/builds/hg-shared',
-        },
-        'stage_product': 'b2g',
-        'product_name': 'b2g',
-        'base_name': builder_prefix + '_%(branch)s_%(platform)s',
-        'slaves': SLAVES['mock'],
-        'enable_periodic': False,
-        'enable_dep': True,
-        'maxTime': 6 * 3600,
-    },
-    'emulator-l-debug': {
-        'mozharness_config': {
-            'script_name': 'scripts/b2g_build.py',
-            # b2g_build.py will checkout gecko from hg and look up a tooltool manifest given by the
-            # --target name below
-            'extra_args': ['--target', 'emulator-l', '--config', 'b2g/releng-emulator.py',
-                           '--debug',
-                           '--gaia-languages-file', 'locales/languages_dev.json',
-                           '--gecko-languages-file', 'gecko/b2g/locales/all-locales'],
-            'reboot_command': ['bash', '-c', 'sudo reboot; sleep 600'],
-            'mozharness_repo_cache': '/tools/checkouts/mozharness',
-            'tools_repo_cache': '/tools/checkouts/build-tools',
-        },
-        'env': {
-            'HG_SHARE_BASE_DIR': '/builds/hg-shared',
-        },
-        'stage_product': 'b2g',
-        'product_name': 'b2g',
-        'base_name': builder_prefix + '_%(branch)s_%(platform)s',
-        'slaves': SLAVES['mock'],
-        'enable_periodic': True,
-        'enable_dep': False,
-        'maxTime': 6 * 3600,
-    },
-    'flame-kk': {
-        'mozharness_config': {
-            'script_name': 'scripts/b2g_build.py',
-            # b2g_build.py will checkout gecko from hg and look up a tooltool manifest given by the
-            # --target name below
-            'extra_args': ['--target', 'flame-kk', '--config', 'b2g/releng-fota-updates.py',
-                           '--gaia-languages-file', 'locales/languages_all.json',
-                           '--gecko-languages-file', 'gecko/b2g/locales/all-locales',
-                           '--config', GLOBAL_VARS['mozharness_configs']['balrog']],
-            'reboot_command': ['bash', '-c', 'sudo reboot; sleep 600'],
-        },
-        'stage_product': 'b2g',
-        'product_name': 'b2g',
-        'base_name': builder_prefix + '_%(branch)s_%(platform)s',
-        'slaves': SLAVES['mock'],
-        'enable_periodic': True,
-        'enable_dep': False,
-    },
-    'flame-kk_eng': {
-        'mozharness_config': {
-            'script_name': 'scripts/b2g_build.py',
-            # b2g_build.py will checkout gecko from hg and look up a tooltool manifest given by the
-            # --target name below
-            'extra_args': ['--target', 'flame-kk', '--config', 'b2g/releng-otoro-eng.py',
-                           '--gaia-languages-file', 'locales/languages_all.json',
-                           '--gecko-languages-file', 'gecko/b2g/locales/all-locales'],
-            'reboot_command': ['bash', '-c', 'sudo reboot; sleep 600'],
-        },
-        'stage_product': 'b2g',
-        'product_name': 'b2g',
-        'base_name': builder_prefix + '_%(branch)s_%(platform)s',
-        'slaves': SLAVES['mock'],
-        'enable_periodic': False,
-        'enable_dep': True,
-    },
-    'flame-kk_eng-debug': {
-        'mozharness_config': {
-            'script_name': 'scripts/b2g_build.py',
-            # b2g_build.py will checkout gecko from hg and look up a tooltool manifest given by the
-            # --target name below
-            'extra_args': ['--target', 'flame-kk', '--config', 'b2g/releng-otoro-eng.py',
-                           '--debug',
-                           '--gaia-languages-file', 'locales/languages_all.json',
-                           '--gecko-languages-file', 'gecko/b2g/locales/all-locales'],
-            'reboot_command': ['bash', '-c', 'sudo reboot; sleep 600'],
-        },
-        'stage_product': 'b2g',
-        'product_name': 'b2g',
-        'base_name': builder_prefix + '_%(branch)s_%(platform)s',
-        'slaves': SLAVES['mock'],
-        'enable_periodic': True,
-        'enable_dep': False,
-    },
-    'dolphin': {
-        'mozharness_config': {
-            'script_name': 'scripts/b2g_build.py',
-            # b2g_build.py will checkout gecko from hg and look up a tooltool manifest given by the
-            # --target name below
-            'extra_args': ['--target', 'dolphin', '--config', 'b2g/releng-private-updates.py',
-                           '--gaia-languages-file', 'locales/languages_all.json',
-                           '--gecko-languages-file', 'gecko/b2g/locales/all-locales',
-                           '--config', GLOBAL_VARS['mozharness_configs']['balrog']],
-            'reboot_command': ['bash', '-c', 'sudo reboot; sleep 600'],
-            'mozharness_repo_cache': '/tools/checkouts/mozharness',
-            'tools_repo_cache': '/tools/checkouts/build-tools',
-        },
-        'env': {
-            'HG_SHARE_BASE_DIR': '/builds/hg-shared',
-        },
-        'stage_product': 'b2g',
-        'product_name': 'b2g',
-        'base_name': builder_prefix + '_%(branch)s_%(platform)s',
-        'slaves': SLAVES['mock'],
-        'enable_periodic': True,
-        'enable_dep': False,
-    },
-    'dolphin_eng': {
-        'mozharness_config': {
-            'script_name': 'scripts/b2g_build.py',
-            # b2g_build.py will checkout gecko from hg and look up a tooltool manifest given by the
-            # --target name below
-            'extra_args': ['--target', 'dolphin', '--config', 'b2g/releng-otoro-eng.py',
-                           '--gaia-languages-file', 'locales/languages_all.json',
-                           '--gecko-languages-file', 'gecko/b2g/locales/all-locales'],
-            'reboot_command': ['bash', '-c', 'sudo reboot; sleep 600'],
-            'mozharness_repo_cache': '/tools/checkouts/mozharness',
-            'tools_repo_cache': '/tools/checkouts/build-tools',
-        },
-        'env': {
-            'HG_SHARE_BASE_DIR': '/builds/hg-shared',
-        },
-        'stage_product': 'b2g',
-        'product_name': 'b2g',
-        'base_name': builder_prefix + '_%(branch)s_%(platform)s',
-        'slaves': SLAVES['mock'],
-        'enable_periodic': True,
-        'enable_dep': False,
-    },
-    'dolphin-512': {
-        'mozharness_config': {
-            'script_name': 'scripts/b2g_build.py',
-            # b2g_build.py will checkout gecko from hg and look up a tooltool manifest given by the
-            # --target name below
-            'extra_args': ['--target', 'dolphin-512', '--config', 'b2g/releng-private-updates.py',
-                           '--gaia-languages-file', 'locales/languages_all.json',
-                           '--gecko-languages-file', 'gecko/b2g/locales/all-locales',
-                           '--config', GLOBAL_VARS['mozharness_configs']['balrog']],
-            'reboot_command': ['bash', '-c', 'sudo reboot; sleep 600'],
-            'mozharness_repo_cache': '/tools/checkouts/mozharness',
-            'tools_repo_cache': '/tools/checkouts/build-tools',
-        },
-        'env': {
-            'HG_SHARE_BASE_DIR': '/builds/hg-shared',
-        },
-        'stage_product': 'b2g',
-        'product_name': 'b2g',
-        'base_name': builder_prefix + '_%(branch)s_%(platform)s',
-        'slaves': SLAVES['mock'],
-        'enable_periodic': True,
-        'enable_dep': False,
-    },
-    'dolphin-512_eng': {
-        'mozharness_config': {
-            'script_name': 'scripts/b2g_build.py',
-            # b2g_build.py will checkout gecko from hg and look up a tooltool manifest given by the
-            # --target name below
-            'extra_args': ['--target', 'dolphin-512', '--config', 'b2g/releng-otoro-eng.py',
-                           '--gaia-languages-file', 'locales/languages_all.json',
-                           '--gecko-languages-file', 'gecko/b2g/locales/all-locales'],
-            'reboot_command': ['bash', '-c', 'sudo reboot; sleep 600'],
-            'mozharness_repo_cache': '/tools/checkouts/mozharness',
-            'tools_repo_cache': '/tools/checkouts/build-tools',
-        },
-        'env': {
-            'HG_SHARE_BASE_DIR': '/builds/hg-shared',
-        },
-        'stage_product': 'b2g',
-        'product_name': 'b2g',
-        'base_name': builder_prefix + '_%(branch)s_%(platform)s',
-        'slaves': SLAVES['mock'],
-        'enable_periodic': True,
-        'enable_dep': False,
-    },
-    "linux64_graphene": {
-        "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", "graphene",
-                '--config', GLOBAL_VARS['mozharness_configs']['balrog'],
-            ],
-            "script_timeout": 3 * 3600,
-            "script_maxtime": int(5.5 * 3600),
-        },
-        "stage_product": "b2g",
-        "base_name": "graphene_%(branch)s_linux64",
-        "platform_objdir": OBJDIR,
-        "slaves": SLAVES["mock"],
-        "try_by_default": False,
-    },
-    "macosx64_graphene": {
-        "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_mac_64_builds.py",
-                "--custom-build-variant-cfg", "graphene",
-                '--config', GLOBAL_VARS['mozharness_configs']['balrog'],
-            ],
-            "script_timeout": 3 * 3600,
-            "script_maxtime": int(5.5 * 3600),
-        },
-        "stage_product": "b2g",
-        "base_name": "graphene_%(branch)s_macosx64",
-        "platform_objdir": OBJDIR,
-        "slaves": SLAVES["macosx64-lion"],
-        "try_by_default": False,
-    },
-    "win64_graphene": {
-        "mozharness_python": ["c:/mozilla-build/python27/python", "-u"],
-        "reboot_command": [
-            "c:/mozilla-build/python27/python", "-u",
-            "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_windows_64_builds.py",
-                "--custom-build-variant-cfg", "graphene",
-                '--config', GLOBAL_VARS['mozharness_configs']['balrog'],
-            ],
-            "script_timeout": 3 * 3600,
-            "script_maxtime": int(5.5 * 3600),
-        },
-        "stage_product": "b2g",
-        "base_name": "graphene_%(branch)s_win64",
-        "platform_objdir": OBJDIR,
-        "slaves": SLAVES["win64-rev2"],
-        "try_by_default": False,
-    },
-    "linux64_horizon": {
-        "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", "horizon",
-                '--config', GLOBAL_VARS['mozharness_configs']['balrog'],
-            ],
-            "script_timeout": 3 * 3600,
-            "script_maxtime": int(5.5 * 3600),
-        },
-        "stage_product": "b2g",
-        "base_name": "horizon_%(branch)s_linux64",
-        "platform_objdir": OBJDIR,
-        "slaves": SLAVES["mock"],
-        "try_by_default": False,
-    },
-    "macosx64_horizon": {
-        "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_mac_64_builds.py",
-                "--custom-build-variant-cfg", "horizon",
-                '--config', GLOBAL_VARS['mozharness_configs']['balrog'],
-            ],
-            "script_timeout": 3 * 3600,
-            "script_maxtime": int(5.5 * 3600),
-        },
-        "stage_product": "b2g",
-        "base_name": "horizon_%(branch)s_macosx64",
-        "platform_objdir": OBJDIR,
-        "slaves": SLAVES["macosx64-lion"],
-        "try_by_default": False,
-    },
-    "win64_horizon": {
-        "mozharness_python": ["c:/mozilla-build/python27/python", "-u"],
-        "reboot_command": [
-            "c:/mozilla-build/python27/python", "-u",
-            "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_windows_64_builds.py",
-                "--custom-build-variant-cfg", "horizon",
-                '--config', GLOBAL_VARS['mozharness_configs']['balrog'],
-            ],
-            "script_timeout": 3 * 3600,
-            "script_maxtime": int(5.5 * 3600),
-        },
-        "stage_product": "b2g",
-        "base_name": "horizon_%(branch)s_win64",
-        "platform_objdir": OBJDIR,
-        "slaves": SLAVES["win64-rev2"],
-        "try_by_default": False,
-    },
-}
-
-for platform in PLATFORM_VARS.values():
-    if 'env' not in platform:
-        platform['env'] = deepcopy(GLOBAL_ENV)
-    else:
-        platform['env'].update((k, v) for k, v in GLOBAL_ENV.items() if k not in platform['env'])
-
-
-# All branches (not in project_branches) that are to be built MUST be listed here, along with their
-# platforms (if different from the default set).
-BRANCHES = {
-    'mozilla-central': {
-    },
-    'mozilla-b2g44_v2_5': {
-        'gecko_version': 44,
-        'b2g_version': (2, 5, 0),
-        'lock_platforms': True,
-        'platforms': {
-            'emulator': {},
-            'emulator-debug': {},
-            'emulator-l': {},
-            'emulator-l-debug': {},
-            'flame-kk': {},
-            'flame-kk_eng': {},
-        },
-    },
-    'try': {
-        'lock_platforms': True,
-        'platforms': {
-            'linux64_graphene': {},
-            'macosx64_graphene': {},
-            'win64_graphene': {},
-            'linux64_horizon': {},
-            'macosx64_horizon': {},
-            'win64_horizon': {},
-            'emulator': {},
-            'emulator-debug': {},
-            # Graphene builds. These are a different app (ie, not B2G) and would
-            # have their own config files in an ideal world, but it's not worth
-            # the effort at this point.
-            'linux64_graphene': {},
-            'macosx64_graphene': {},
-            'win64_graphene': {},
-            # Horizon is a browser variant based on Graphene.
-            'linux64_horizon': {},
-            'macosx64_horizon': {},
-            'win64_horizon': {},
-        },
-    },
-}
-
-setMainFirefoxVersions(BRANCHES)
-
-# Copy project branches into BRANCHES keys
-for branch in ACTIVE_PROJECT_BRANCHES:
-    BRANCHES[branch] = deepcopy(PROJECT_BRANCHES[branch])
-
-# Copy global vars in first, then platform vars
-for branch in BRANCHES.keys():
-    for key, value in GLOBAL_VARS.items():
-        # Don't override platforms if it's set and locked
-        if key == 'platforms' and 'platforms' in BRANCHES[branch] and BRANCHES[branch].get('lock_platforms'):
-            continue
-        else:
-            BRANCHES[branch][key] = deepcopy(value)
-
-        # bug 1218589 - Enable nightly mozilla-central builds of graphene     
-        if key == 'platforms' and branch == 'mozilla-central':
-            graphene = {'linux64_graphene': {}, 'macosx64_graphene': {}, 'win64_graphene': {}}
-            BRANCHES[branch][key].update(graphene)
-
-    for platform, platform_config in PLATFORM_VARS.items():
-        if platform in BRANCHES[branch]['platforms']:
-            for key, value in platform_config.items():
-                # put default platform set in all branches, but grab any
-                # project_branches.py overrides/additional keys
-                if branch in ACTIVE_PROJECT_BRANCHES and 'platforms' in PROJECT_BRANCHES[branch]:
-                    if platform in PROJECT_BRANCHES[branch]['platforms'].keys():
-                        if key in PROJECT_BRANCHES[branch]['platforms'][platform].keys():
-                            value = deepcopy(PROJECT_BRANCHES[branch]['platforms'][platform][key])
-                else:
-                    value = deepcopy(value)
-                if isinstance(value, str):
-                    value = value % locals()
-                else:
-                    value = deepcopy(value)
-                BRANCHES[branch]['platforms'][platform][key] = value
-
-            if branch in ACTIVE_PROJECT_BRANCHES and 'platforms' in PROJECT_BRANCHES[branch] and \
-                    platform in PROJECT_BRANCHES[branch]['platforms']:
-                for key, value in PROJECT_BRANCHES[branch]['platforms'][platform].items():
-                    if key == 'env':
-                        value = deepcopy(PLATFORM_VARS[platform]['env'])
-                        value.update(PROJECT_BRANCHES[branch]['platforms'][platform][key])
-                    else:
-                        value = deepcopy(value)
-                    BRANCHES[branch]['platforms'][platform][key] = value
-    # Copy in local config
-    if branch in b2g_localconfig.BRANCHES:
-        for key, value in b2g_localconfig.BRANCHES[branch].items():
-            if key == 'platforms':
-                # Merge in these values
-                if 'platforms' not in BRANCHES[branch]:
-                    BRANCHES[branch]['platforms'] = {}
-
-                for platform, platform_config in value.items():
-                    for key, value in platform_config.items():
-                        value = deepcopy(value)
-                        if isinstance(value, str):
-                            value = value % locals()
-                        BRANCHES[branch]['platforms'][platform][key] = value
-            else:
-                BRANCHES[branch][key] = deepcopy(value)
-
-    for platform, platform_config in b2g_localconfig.PLATFORM_VARS.items():
-        if platform in BRANCHES[branch]['platforms']:
-            for key, value in platform_config.items():
-                value = deepcopy(value)
-                if isinstance(value, str):
-                    value = value % locals()
-                BRANCHES[branch]['platforms'][platform][key] = value
-
-    # Check for project branch removing a platform from default platforms
-    if branch in ACTIVE_PROJECT_BRANCHES:
-        for key, value in PROJECT_BRANCHES[branch].items():
-            if key == 'platforms':
-                for platform, platform_config in value.items():
-                    if platform_config.get('dont_build'):
-                        del BRANCHES[branch]['platforms'][platform]
-
-
-######## remove most B2G builds from cedar
-for platform in ('nexus-4', 'nexus-4_eng', 'nexus-5-l', 'nexus-5-l_eng',
-                 'flame-kk', 'flame-kk_eng', 'flame-kk_eng-debug'):
-    if platform in BRANCHES['cedar']['platforms']:
-        del BRANCHES['cedar']['platforms'][platform]
-
-# bug 1222209 - Remove nexus-4 builds from pine
-for platform in ('nexus-4', 'nexus-4_eng'):
-    if platform in BRANCHES['pine']['platforms']:
-        del BRANCHES['pine']['platforms'][platform]
-
-######## mozilla-central
-# This is a path, relative to HGURL, where the repository is located
-# HGURL + repo_path should be a valid repository
-BRANCHES['mozilla-central']['repo_path'] = 'mozilla-central'
-BRANCHES['mozilla-central']['gaia_l10n_root'] = 'https://hg.mozilla.org/gaia-l10n'
-BRANCHES['mozilla-central']['gecko_l10n_root'] = 'https://hg.mozilla.org/l10n-central'
-BRANCHES['mozilla-central']['start_hour'] = [3, 15]
-BRANCHES['mozilla-central']['start_minute'] = [2]
-BRANCHES['mozilla-central']['periodic_start_hours'] = range(1, 24, 3)
-BRANCHES['mozilla-central']['periodic_start_minute'] = 30
-BRANCHES['mozilla-central']['platforms']['nexus-4']['enable_nightly'] = True
-BRANCHES['mozilla-central']['platforms']['nexus-4_eng']['enable_nightly'] = True
-BRANCHES['mozilla-central']['platforms']['nexus-4_eng']['consider_for_nightly'] = False
-BRANCHES['mozilla-central']['platforms']['nexus-5-l']['enable_nightly'] = True
-BRANCHES['mozilla-central']['platforms']['nexus-5-l_eng']['enable_nightly'] = True
-BRANCHES['mozilla-central']['platforms']['nexus-5-l_eng']['consider_for_nightly'] = False
-BRANCHES['mozilla-central']['platforms']['flame-kk']['enable_nightly'] = True
-BRANCHES['mozilla-central']['platforms']['flame-kk_eng']['enable_nightly'] = True
-# bug 1218589 - Enable nightly mozilla-central builds of graphene     
-BRANCHES['mozilla-central']['platforms']['linux64_graphene']['enable_nightly'] = True
-BRANCHES['mozilla-central']['platforms']['macosx64_graphene']['enable_nightly'] = True
-BRANCHES['mozilla-central']['platforms']['win64_graphene']['enable_nightly'] = True
-BRANCHES['mozilla-central']['platforms']['linux64_graphene']['slaves'] = SLAVES['mock']
-BRANCHES['mozilla-central']['platforms']['macosx64_graphene']['slaves'] = SLAVES['macosx64-lion']
-BRANCHES['mozilla-central']['platforms']['win64_graphene']['slaves'] = SLAVES['win64-rev2']
-
-
-######## mozilla-b2g44_v2_5
-# This is a path, relative to HGURL, where the repository is located
-# HGURL + repo_path should be a valid repository
-BRANCHES['mozilla-b2g44_v2_5']['repo_path'] = 'releases/mozilla-b2g44_v2_5'
-# TODO: coordinate l1n repos with bug 1218060
-BRANCHES['mozilla-b2g44_v2_5']['gaia_l10n_root'] = 'https://hg.mozilla.org/releases/gaia-l10n/v2_5'
-BRANCHES['mozilla-b2g44_v2_5']['gecko_l10n_root'] = 'https://hg.mozilla.org/releases/l10n/mozilla-aurora'
-BRANCHES['mozilla-b2g44_v2_5']['start_hour'] = [0]
-BRANCHES['mozilla-b2g44_v2_5']['start_minute'] = [45]
-BRANCHES['mozilla-b2g44_v2_5']['periodic_start_minute'] = 30
-BRANCHES['mozilla-b2g44_v2_5']['platforms']['flame-kk']['enable_nightly'] = True
-BRANCHES['mozilla-b2g44_v2_5']['platforms']['flame-kk_eng']['enable_nightly'] = True
-BRANCHES['mozilla-b2g44_v2_5']['platforms']['emulator']['enable_nightly'] = False
-BRANCHES['mozilla-b2g44_v2_5']['platforms']['emulator-debug']['enable_nightly'] = False
-BRANCHES['mozilla-b2g44_v2_5']['platforms']['emulator-l']['enable_nightly'] = False
-BRANCHES['mozilla-b2g44_v2_5']['platforms']['emulator-l-debug']['enable_nightly'] = False
-
-######## try
-# Try-specific configs
-# This is a path, relative to HGURL, where the repository is located
-# HGURL  repo_path should be a valid repository
-BRANCHES['try']['repo_path'] = 'try'
-BRANCHES['try']['gaia_l10n_root'] = 'https://hg.mozilla.org/gaia-l10n'
-BRANCHES['try']['gecko_l10n_root'] = 'https://hg.mozilla.org/l10n-central'
-BRANCHES['try']['enable_merging'] = False
-BRANCHES['try']['enable_try'] = True
-BRANCHES['try']['package_dir'] = '%(who)s-%(got_revision)s/'
-BRANCHES['try']['stage_username'] = 'trybld'
-BRANCHES['try']['stage_ssh_key'] = 'trybld_dsa'
-# Disable Nightly builds
-BRANCHES['try']['enable_nightly'] = False
-BRANCHES['try']['platforms']['linux64_graphene']['slaves'] = TRY_SLAVES['mock']
-BRANCHES['try']['platforms']['macosx64_graphene']['slaves'] = TRY_SLAVES['macosx64-lion']
-BRANCHES['try']['platforms']['win64_graphene']['slaves'] = TRY_SLAVES['win64-rev2']
-BRANCHES['try']['platforms']['linux64_horizon']['slaves'] = TRY_SLAVES['mock']
-BRANCHES['try']['platforms']['macosx64_horizon']['slaves'] = TRY_SLAVES['macosx64-lion']
-BRANCHES['try']['platforms']['win64_horizon']['slaves'] = TRY_SLAVES['win64-rev2']
-
-BRANCHES['try']['platforms']['emulator']['slaves'] = TRY_SLAVES['mock']
-BRANCHES['try']['platforms']['emulator']['mozharness_config']['extra_args'] = ['--target', 'emulator', '--config', 'b2g/releng-try.py', '--gaia-languages-file', 'locales/languages_dev.json', '--gecko-languages-file', 'gecko/b2g/locales/all-locales']
-BRANCHES['try']['platforms']['emulator-debug']['slaves'] = TRY_SLAVES['mock']
-BRANCHES['try']['platforms']['emulator-debug']['mozharness_config']['extra_args'] = ['--target', 'emulator', '--config', 'b2g/releng-try.py', '--debug', '--gaia-languages-file', 'locales/languages_dev.json', '--gecko-languages-file', 'gecko/b2g/locales/all-locales']
-
-# Enable mozharness pinning
-for name, branch in items_at_least(BRANCHES, 'gecko_version', 30):
-    branch['script_repo_manifest'] = \
-        "https://hg.mozilla.org/%(repo_path)s/raw-file/%(revision)s/" + \
-        "testing/mozharness/mozharness.json"
-    # mozharness_archiver_repo_path tells the factory to use a copy of mozharness from within the
-    #  gecko tree and also allows us to overwrite which gecko repo to use. Useful for platforms
-    # like Thunderbird
-    branch['mozharness_archiver_repo_path'] = '%(repo_path)s'
-
-# Enable mozharness desktop builds
-for name, branch in items_at_least(BRANCHES, 'gecko_version', 39):
-    # if true, any platform with mozharness_desktop_build in its config
-    # will use mozharness instead of MozillaBuildFactory
-    branch['desktop_mozharness_builds_enabled'] = True
-
-# v1.12.20 causes bug 1165727, using v1.12.16 instead
-for branch in BRANCHES:
-    for platform in BRANCHES[branch]['platforms']:
-        if BRANCHES[branch]['platforms'][platform].get('mozharness_config', {}).get('extra_args'):
-            BRANCHES[branch]['platforms'][platform]['mozharness_config']['extra_args'].extend(
-                ['--repotool-revision', 'v1.12.16'])
-
-######## generic branch configs
-for branch in ACTIVE_PROJECT_BRANCHES:
-    branchConfig = PROJECT_BRANCHES[branch]
-    BRANCHES[branch]['gaia_l10n_root'] = 'https://hg.mozilla.org/gaia-l10n'
-    BRANCHES[branch]['gecko_l10n_root'] = 'https://hg.mozilla.org/l10n-central'
-    BRANCHES[branch]['product_name'] = branchConfig.get('product_name', None)
-    BRANCHES[branch]['app_name'] = branchConfig.get('app_name', None)
-    BRANCHES[branch]['repo_path'] = branchConfig.get('repo_path', 'projects/' + branch)
-    BRANCHES[branch]['mozharness_repo_path'] = branchConfig.get('mozharness_repo_path', GLOBAL_VARS['mozharness_repo_path'])
-    BRANCHES[branch]['mozharness_tag'] = branchConfig.get('mozharness_tag', GLOBAL_VARS['mozharness_tag'])
-    BRANCHES[branch]['enabled_products'] = branchConfig.get('enabled_products',
-                                                            GLOBAL_VARS['enabled_products'])
-    BRANCHES[branch]['enable_nightly'] = branchConfig.get('enable_nightly', False)
-    BRANCHES[branch]['enable_nightly_everytime'] = branchConfig.get('enable_nightly_everytime', False)
-    BRANCHES[branch]['periodic_start_hours'] = branchConfig.get('periodic_start_hours', range(0, 24, 6))
-    BRANCHES[branch]['periodic_start_minute'] = branchConfig.get('periodic_start_minute', 30)
-    BRANCHES[branch]['start_hour'] = branchConfig.get('start_hour', [4])
-    BRANCHES[branch]['start_minute'] = branchConfig.get('start_minute', [42])
-    # nightly updates
-    BRANCHES[branch]['updates_enabled'] = branchConfig.get('updates_enabled', False)
-    BRANCHES[branch]['update_channel'] = branchConfig.get('update_channel', 'nightly-%s' % branch)
-    BRANCHES[branch]['create_partial'] = branchConfig.get('create_partial', False)
-    BRANCHES[branch]['create_partial_l10n'] = branchConfig.get('create_partial_l10n', False)
-    BRANCHES[branch]['enUS_binaryURL'] = GLOBAL_VARS['download_base_url'] + branchConfig.get('enUS_binaryURL', '')
-    # Platform-specific defaults/interpretation
-    for platform in BRANCHES[branch]['platforms']:
-        # point to the mozconfigs, default is generic
-        if platform.endswith('debug'):
-            BRANCHES[branch]['platforms'][platform]['mozconfig'] = platform.split('-')[0] + '/' + branchConfig.get('mozconfig_dir', 'generic') + '/debug'
-        else:
-            BRANCHES[branch]['platforms'][platform]['mozconfig'] = platform + '/' + branchConfig.get('mozconfig_dir', 'generic') + '/nightly'
-
-# bug 1227277 - Disabling b2g builds on project branches other than pine
-B2GTWIGS = [x for x in ACTIVE_PROJECT_BRANCHES if x not in ('mozilla-inbound', 'fx-team', 'pine')]
-for branch in B2GTWIGS:
-    for platform in GLOBAL_VARS['platforms']:
-        if branch not in BRANCHES:
-            continue
-        if platform in BRANCHES[branch]['platforms']:
-            del BRANCHES[branch]['platforms'][platform]
-
-# Bug 1250953 - Disable ICS emulator builds/tests on trunk
-for branch in BRANCHES.keys():
-    for platform in BRANCHES[branch]['platforms'].keys():
-        if branch in ['mozilla-b2g44_v2_5', 'try']:
-            continue
-        if platform in ['emulator', 'emulator-debug']:
-            del BRANCHES[branch]['platforms'][platform]
-
-# Bug 1253630 - Turn off B2G device builds on trunk branches (buildbot only)
-for name, branch in items_at_least(BRANCHES, 'gecko_version', 47):
-    for platform in BRANCHES[name]['platforms'].keys():
-        if platform in ['flame-kk', 'flame-kk_eng', 'nexus-4', 'nexus-4_eng', 'nexus-5-l', 'nexus-5-l_eng']:
-            del BRANCHES[name]['platforms'][platform]
-
-if __name__ == "__main__":
-    import sys
-    import pprint
-
-    args = sys.argv[1:]
-
-    if len(args) > 0:
-        items = dict([(b, BRANCHES[b]) for b in args])
-    else:
-        items = BRANCHES
-
-    for k, v in sorted(items.iteritems()):
-        out = pprint.pformat(v)
-        for l in out.splitlines():
-            print '%s: %s' % (k, l)
deleted file mode 100644
--- a/mozilla/b2g_production_config.py
+++ /dev/null
@@ -1,19 +0,0 @@
-from copy import deepcopy
-import localconfig
-
-from localconfig import GLOBAL_VARS, BUILDS_BEFORE_REBOOT, \
-    SYMBOL_SERVER_HOST
-
-GLOBAL_VARS = deepcopy(localconfig.GLOBAL_VARS)
-
-# Local branch overrides
-BRANCHES = {
-    'try': {
-        'package_url': 'https://archive.mozilla.org/pub/b2g/try-builds',
-    },
-}
-
-PLATFORM_VARS = {}
-
-PROJECTS = {}
-BUILDS_BEFORE_REBOOT = localconfig.BUILDS_BEFORE_REBOOT
deleted file mode 100644
--- a/mozilla/b2g_project_branches.py
+++ /dev/null
@@ -1,101 +0,0 @@
-# Additional branches that start as identical (individual variables can be overriden here)
-PROJECT_BRANCHES = {
-    ### PLEASE ADD NEW BRANCHES ALPHABETICALLY (twigs at the bottom, also alphabetically)
-    # 'build-system': {},  # Bug 1010674
-    'fx-team': {
-        'repo_path': 'integration/fx-team',
-        'periodic_start_hours': range(2, 24, 3),
-        'enable_perproduct_builds': True,
-        'enable_nightly': False,
-    },
-    # Please sync any customizations made to mozilla-inbound to cypress.
-    'mozilla-inbound': {
-        'repo_path': 'integration/mozilla-inbound',
-        'periodic_start_hours': range(1, 24, 3),
-        'enable_perproduct_builds': True,
-    },
-    #'services-central': {},  # Bug 1010674
-    # B2G builds not required on the UX branch
-    #'ux': {
-    #    'branch_name': 'UX',
-    #    'mobile_branch_name': 'UX',
-    #    'build_branch': 'UX',
-    #    'enable_nightly': True,
-    #},
-    #####  TWIGS aka RENTABLE BRANCHES
-    # 'alder': {},
-    'ash': {
-        'enable_nightly': True,
-        'platforms': {
-            'nexus-4': {
-                'enable_nightly': True,
-            },
-            'nexus-4_eng': {
-                'enable_nightly': True,
-                'consider_for_nightly': False,
-            },
-            'nexus-5-l': {
-                'enable_nightly': True,
-            },
-            'nexus-5-l_eng': {
-                'enable_nightly': True,
-                'consider_for_nightly': False,
-            },
-            'flame-kk': {
-                'enable_nightly': True,
-            },
-            'flame-kk_eng': {
-                'enable_nightly': True,
-            },
-            'emulator': {
-                'enable_nightly': True,
-            },
-            'emulator-debug': {
-                'enable_nightly': True,
-            },
-            'emulator-jb': {
-                'enable_nightly': True,
-            },
-            'emulator-jb-debug': {
-                'enable_nightly': True,
-            },
-            'emulator-kk': {
-                'enable_nightly': True,
-            },
-            'emulator-kk-debug': {
-                'enable_nightly': True,
-            },
-        },
-    },
-    # Not needed on Birch at the moment, bug 977420.
-    #'birch': {},
-    'cedar': {
-        'mozharness_tag': 'default',
-    },
-    'cypress': {
-        'lock_platforms': True,
-        'platforms': {
-            # Limit B2G to none for Bug 787208
-        },
-    },
-    # B2G builds not required on date
-    # 'date': {},
-    # Dsiabled by Bug 1135702
-    # 'fig': {},
-    # disabled by bug 1134508
-    # 'gum': {},
-    # disabled for bug 985718
-    #'holly': {},
-    # disabled for bug 1150320
-    #'jamun': {},
-    # disabled in bug 1215527
-    # 'maple': {},
-    # Customizations for integration work for bugs 481815 and 307181
-    'oak': {
-        'enable_nightly': True
-    },
-    'pine': {}
-}
-
-# All is the default
-ACTIVE_PROJECT_BRANCHES = PROJECT_BRANCHES.keys()
deleted file mode 100644
--- a/mozilla/b2g_staging_config.py
+++ /dev/null
@@ -1,19 +0,0 @@
-from copy import deepcopy
-import localconfig
-
-from localconfig import GLOBAL_VARS, BUILDS_BEFORE_REBOOT, \
-    SYMBOL_SERVER_HOST
-
-GLOBAL_VARS = deepcopy(localconfig.GLOBAL_VARS)
-
-# Local branch overrides
-BRANCHES = {
-    'try': {
-        'package_url': 'http://ftp.stage.mozaws.net/pub/b2g/try-builds',
-    },
-}
-
-PLATFORM_VARS = {}
-
-PROJECTS = {}
-BUILDS_BEFORE_REBOOT = localconfig.BUILDS_BEFORE_REBOOT
--- a/mozilla/build_localconfig.py
+++ b/mozilla/build_localconfig.py
@@ -16,59 +16,39 @@ if 'http_port' in master_config:
 
 if 'ssh_port' in master_config:
     c['manhole'] = manhole.PasswordManhole(
             "tcp:%(ssh_port)i:interface=127.0.0.1" % master_config,
             "cltbld", "password")
 
 from config import BRANCHES, SLAVES, PROJECTS, ACTIVE_PROJECT_BRANCHES, BRANCH_PROJECTS
 from thunderbird_config import ACTIVE_PROJECT_BRANCHES as ACTIVE_THUNDERBIRD_PROJECT_BRANCHES
-from b2g_config import ACTIVE_PROJECT_BRANCHES as ACTIVE_B2G_PROJECT_BRANCHES
 if 'limit_branches' in master_config:
     ACTIVE_BRANCHES = [x.encode("utf-8") for x in master_config['limit_branches']]
 else:
     ACTIVE_BRANCHES = ACTIVE_PROJECT_BRANCHES[:]
     ACTIVE_BRANCHES.extend([
         'mozilla-central',
         'mozilla-beta',
         'mozilla-aurora',
         'mozilla-release',
         'mozilla-esr38',
         'mozilla-esr45',
-        'mozilla-b2g44_v2_5',
     ])
 if 'limit_tb_branches' in master_config:
     ACTIVE_THUNDERBIRD_BRANCHES = [x.encode("utf-8") for x in master_config['limit_tb_branches']]
 else:
     ACTIVE_THUNDERBIRD_BRANCHES = ACTIVE_THUNDERBIRD_PROJECT_BRANCHES[:]
     ACTIVE_THUNDERBIRD_BRANCHES.extend([
         'comm-central',
         'comm-beta',
         'comm-aurora',
         'comm-esr38',
         'comm-esr45',
     ])
-if 'limit_b2g_branches' in master_config:
-    ACTIVE_B2G_BRANCHES = [x.encode("utf-8") for x in master_config['limit_b2g_branches']]
-else:
-    ACTIVE_B2G_BRANCHES = ACTIVE_B2G_PROJECT_BRANCHES[:]
-    ACTIVE_B2G_BRANCHES.extend([
-        'mozilla-central',
-        'mozilla-b2g44_v2_5'
-    ])
-    # MERGE DAY: Remove the following block when we are sure b2g CI is moved to
-    # taskcluster
-    # Add mozilla-aurora on odd-numbered m-c gecko versions
-    # b = {'mozilla-central': {}}
-    # master_common.setMainFirefoxVersions(b)
-    # Starting with v2.2, b2g automation will be handled by taskcluster
-    # if b['mozilla-central']['gecko_version'] % 2:
-    #    ACTIVE_B2G_BRANCHES.append('mozilla-aurora')
-    # MERGE DAY: end
-
 if 'limit_projects' in master_config:
     ACTIVE_PROJECTS = [x.encode("utf-8") for x in master_config['limit_projects']]
 else:
     ACTIVE_PROJECTS = PROJECTS.keys()
 ACTIVE_PROJECTS = [p for p in ACTIVE_PROJECTS if not PROJECTS[p].get('enable_try')]
 
 if 'limit_branch_projects' in master_config:
     ACTIVE_BRANCH_PROJECTS = [x.encode("utf-8") for x in master_config['limit_branch_projects']]
--- a/mozilla/builder_master.cfg
+++ b/mozilla/builder_master.cfg
@@ -5,25 +5,23 @@ import os, sys
 # NOTE: builder_master.cfg and universal_master_sqlite.cfg need to be kept in sync
 #       as much of the logic is duplicated between them.
 
 import buildbotcustom.misc
 import buildbotcustom.status.queued_command
 import master_common
 import config
 import thunderbird_config
-import b2g_config
 import master_localconfig
 import build.paths
 reload(buildbotcustom.misc)
 reload(buildbotcustom.status.queued_command)
 reload(master_common)
 reload(config)
 reload(thunderbird_config)
-reload(b2g_config)
 reload(master_localconfig)
 reload(build.paths)
 
 from master_common import BuildmasterConfig
 from build.paths import getRealpath
 
 c = BuildmasterConfig
 for key, value in master_localconfig.BuildmasterConfig.items():
@@ -39,21 +37,20 @@ commandsQueue = QueueDir('commands', '%s
 from buildbotcustom.status.queued_command import QueuedCommandHandler
 c['status'].append(QueuedCommandHandler(
     command=[sys.executable, os.path.join(os.path.dirname(buildbotcustom.__file__), 'bin', 'postrun.py'), '-c', os.path.abspath(os.path.join(os.curdir, 'postrun.cfg'))],
     queuedir=commandsQueue,
 ))
 
 from config import BRANCHES, PROJECTS
 from thunderbird_config import BRANCHES as THUNDERBIRD_BRANCHES
-from b2g_config import BRANCHES as B2G_BRANCHES
 from master_localconfig import ACTIVE_BRANCHES, ACTIVE_PROJECTS, SLAVES, \
          ENABLE_RELEASES, ACTIVE_RELEASE_BRANCHES, \
          ACTIVE_MOBILE_RELEASE_BRANCHES, ACTIVE_THUNDERBIRD_BRANCHES, \
-         ACTIVE_THUNDERBIRD_RELEASE_BRANCHES, ACTIVE_B2G_BRANCHES
+         ACTIVE_THUNDERBIRD_RELEASE_BRANCHES
 
 import BuildSlaves
 reload(BuildSlaves)
 from BuildSlaves import SlavePasswords
 from buildbot.buildslave import BuildSlave
 
 for platform, names in SLAVES.items():
     for name in names:
@@ -82,27 +79,16 @@ for branch in ACTIVE_THUNDERBIRD_BRANCHE
     # Strip away any duplicate change sources
     usefulChangeSources = []
     for cs in branchObjects['change_source']:
         if cs.branch not in [x.branch for x in buildObjects['change_source'] + usefulChangeSources]:
             usefulChangeSources.append(cs)
     branchObjects['change_source'] = usefulChangeSources
     buildObjects = mergeBuildObjects(buildObjects, branchObjects)
 
-for branch in ACTIVE_B2G_BRANCHES:
-    branchObjects = generateBranchObjects(B2G_BRANCHES[branch], branch,
-            getattr(passwords, 'secrets', None))
-    # Strip away any duplicate change sources
-    usefulChangeSources = []
-    for cs in branchObjects['change_source']:
-        if cs.branch not in [x.branch for x in buildObjects['change_source'] + usefulChangeSources]:
-            usefulChangeSources.append(cs)
-    branchObjects['change_source'] = usefulChangeSources
-    buildObjects = mergeBuildObjects(buildObjects, branchObjects)
-
 for project in ACTIVE_PROJECTS:
     projectObjects = generateProjectObjects(project, PROJECTS[project], SLAVES)
     buildObjects = mergeBuildObjects(buildObjects, projectObjects)
 
 # Remove duplicate change sources
 for cs in buildObjects['change_source'][:]:
     while buildObjects['change_source'].count(cs) > 1:
         buildObjects['change_source'].remove(cs)
--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -2279,23 +2279,16 @@ BRANCHES = {
             'linux64-av': {},
             'linux-debug': {},
             'linux64-debug': {},
             'macosx64-debug': {},
             'win32-debug': {},
             'win64-debug': {},
         },
     },
-    'mozilla-b2g44_v2_5': {
-        'merge_builds': False,
-        'branch_projects': [],
-        'lock_platforms': True,
-        'gecko_version': 44,
-        'platforms': {},
-    },
     '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': {},
@@ -2760,41 +2753,16 @@ BRANCHES['mozilla-esr45']['enable_nightl
 BRANCHES['mozilla-esr45']['enable_nightly_everytime'] = False
 BRANCHES['mozilla-esr45']['updates_enabled'] = False
 BRANCHES['mozilla-esr45']['create_partial'] = False
 BRANCHES['mozilla-esr45']['enable_blocklist_update'] = True
 BRANCHES['mozilla-esr45']['enable_hsts_update'] = True
 BRANCHES['mozilla-esr45']['enable_hpkp_update'] = True
 BRANCHES['mozilla-esr45']['enable_valgrind'] = False
 BRANCHES['mozilla-esr45']['enabled_products'] = ['firefox']
-######## mozilla-b2g44_v2_5
-BRANCHES['mozilla-b2g44_v2_5']['repo_path'] = 'releases/mozilla-b2g44_v2_5'
-BRANCHES['mozilla-b2g44_v2_5']['update_channel'] = 'nightly-b2g44-2.5'
-BRANCHES['mozilla-b2g44_v2_5']['l10n_repo_path'] = 'releases/l10n/mozilla-aurora'
-BRANCHES['mozilla-b2g44_v2_5']['enable_perproduct_builds'] = True
-BRANCHES['mozilla-b2g44_v2_5']['start_hour'] = [3]
-BRANCHES['mozilla-b2g44_v2_5']['start_minute'] = [45]
-BRANCHES['mozilla-b2g44_v2_5']['pgo_platforms'] = []
-BRANCHES['mozilla-b2g44_v2_5']['enable_mac_a11y'] = True
-BRANCHES['mozilla-b2g44_v2_5']['unittest_build_space'] = 6
-# L10n configuration
-BRANCHES['mozilla-b2g44_v2_5']['enable_l10n'] = False
-BRANCHES['mozilla-b2g44_v2_5']['l10nNightlyUpdate'] = False
-BRANCHES['mozilla-b2g44_v2_5']['l10n_platforms'] = ['linux', 'linux64',
-                                                    'win32', 'macosx64']
-BRANCHES['mozilla-b2g44_v2_5']['l10nDatedDirs'] = True
-BRANCHES['mozilla-b2g44_v2_5']['enUS_binaryURL'] = \
-    GLOBAL_VARS['download_base_url'] + '/nightly/latest-mozilla-b2g44_v2_5'
-BRANCHES['mozilla-b2g44_v2_5']['enable_nightly'] = False
-BRANCHES['mozilla-b2g44_v2_5']['create_partial'] = False
-BRANCHES['mozilla-b2g44_v2_5']['enable_blocklist_update'] = False
-BRANCHES['mozilla-b2g44_v2_5']['enable_hsts_update'] = True
-BRANCHES['mozilla-b2g44_v2_5']['enable_hpkp_update'] = True
-BRANCHES['mozilla-b2g44_v2_5']['enable_valgrind'] = False
-BRANCHES['mozilla-b2g44_v2_5']['enabled_products'] = ['firefox']
 
 
 ######## try
 # Try-specific configs
 BRANCHES['try']['l10n_repo_path'] = 'l10n-central'
 BRANCHES['try']['stage_username'] = 'trybld'
 BRANCHES['try']['stage_username_mobile'] = 'trybld'
 BRANCHES['try']['stage_ssh_key'] = 'trybld_dsa'
--- a/mozilla/passwords.py.template
+++ b/mozilla/passwords.py.template
@@ -1,22 +1,22 @@
 BBDB_URL="sqlite:///state.sqlite"
 #PULSE_USERNAME='public'
 #PULSE_PASSWORD='public'
 #PULSE_EXCHANGE='exchange/build/test'
 
 secrets = {
     'nightly-signing': [
-        ('signing.build.mozilla.org:8080', 'user', 'password', ('gpg', 'sha2signcode', 'osslsigncode', 'signcode', 'mar', 'jar', 'b2gmar')),
+        ('signing.build.mozilla.org:8080', 'user', 'password', ('gpg', 'sha2signcode', 'osslsigncode', 'signcode', 'mar', 'jar')),
         ('mac-signing.build.mozilla.org:8080', 'user', 'password', ('gpg', 'mar', 'dmg')),
         ('mac-v2-signing.build.mozilla.org:8080', 'user', 'password', ('gpg', 'mar', 'dmgv2')),
     ],
     'dep-signing': [
-        ('signing.build.mozilla.org:8080', 'user', 'password', ('gpg', 'sha2signcode', 'osslsigncode', 'signcode', 'mar', 'jar', 'b2gmar')),
+        ('signing.build.mozilla.org:8080', 'user', 'password', ('gpg', 'sha2signcode', 'osslsigncode', 'signcode', 'mar', 'jar')),
         ('mac-signing.build.mozilla.org:8080', 'user', 'password', ('gpg', 'mar', 'dmg')),
         ('mac-v2-signing.build.mozilla.org:8080', 'user', 'password', ('gpg', 'mar', 'dmgv2')),
     ],
     'release-signing': [
-        ('signing.build.mozilla.org:8080', 'user', 'password', ('gpg', 'sha2signcode', 'osslsigncode', 'signcode', 'mar', 'jar', 'b2gmar')),
+        ('signing.build.mozilla.org:8080', 'user', 'password', ('gpg', 'sha2signcode', 'osslsigncode', 'signcode', 'mar', 'jar')),
         ('mac-signing.build.mozilla.org:8080', 'user', 'password', ('gpg', 'mar', 'dmg')),
         ('mac-v2-signing.build.mozilla.org:8080', 'user', 'password', ('gpg', 'mar', 'dmgv2')),
     ],
 }
--- a/mozilla/production_config.py
+++ b/mozilla/production_config.py
@@ -94,20 +94,16 @@ BRANCHES = {
     'mozilla-esr38': {
         'tinderbox_tree': 'Mozilla-Esr38',
         'mobile_tinderbox_tree': 'Mozilla-Esr38',
     },
     'mozilla-esr45': {
         'tinderbox_tree': 'Mozilla-Esr45',
         'mobile_tinderbox_tree': 'Mozilla-Esr45',
     },
-    'mozilla-b2g44_v2_5': {
-        'tinderbox_tree': 'Mozilla-B2g44-v2.5',
-        'mobile_tinderbox_tree': 'Mozilla-B2g44-v2.5',
-    },
     'mozilla-beta': {
         'tinderbox_tree': 'Mozilla-Beta',
         'mobile_tinderbox_tree': 'Mozilla-Beta',
     },
     'mozilla-aurora': {
         'tinderbox_tree': 'Mozilla-Aurora',
         'mobile_tinderbox_tree': 'Mozilla-Aurora',
     },
--- a/mozilla/scheduler_master.cfg
+++ b/mozilla/scheduler_master.cfg
@@ -1,21 +1,19 @@
 # import/reload dance so that reconfigs work
 # vim: ft=python
 import buildbotcustom.misc
 import master_common
 import config
 import thunderbird_config
-import b2g_config
 import master_localconfig
 reload(buildbotcustom.misc)
 reload(master_common)
 reload(config)
 reload(thunderbird_config)
-reload(b2g_config)
 reload(master_localconfig)
 
 from master_common import BuildmasterConfig
 from build.paths import getRealpath
 c = BuildmasterConfig
 for key, value in master_localconfig.BuildmasterConfig.items():
     if key in c:
         c[key].extend(value)
@@ -24,23 +22,21 @@ for key, value in master_localconfig.Bui
 
 # Create our QueueDir objects
 # This is reloaded in buildbotcustom.misc
 from mozilla_buildtools.queuedir import QueueDir
 commandsQueue = QueueDir('commands', '%s/commands' % master_localconfig.QUEUEDIR)
 
 from config import BRANCHES, PROJECTS, SLAVES, TRY_SLAVES
 from thunderbird_config import BRANCHES as THUNDERBIRD_BRANCHES
-from b2g_config import BRANCHES as B2G_BRANCHES
 from master_localconfig import ENABLE_RELEASES, ACTIVE_RELEASE_BRANCHES, \
     ACTIVE_MOBILE_RELEASE_BRANCHES, ACTIVE_THUNDERBIRD_RELEASE_BRANCHES
 
 ACTIVE_BRANCHES = BRANCHES.keys()
 ACTIVE_THUNDERBIRD_BRANCHES = THUNDERBIRD_BRANCHES.keys()
-ACTIVE_B2G_BRANCHES = B2G_BRANCHES.keys()
 
 ACTIVE_PROJECTS = PROJECTS.keys()
 
 import buildbotcustom.status.mail
 # Don't reload buildbotcustom.status.mail, it gets reloaded by misc
 
 from buildbotcustom.misc import generateBranchObjects, generateProjectObjects, mergeBuildObjects
 from buildbotcustom.status.mail import ChangeNotifier
@@ -65,26 +61,16 @@ for branch in ACTIVE_THUNDERBIRD_BRANCHE
     # Strip away any duplicate change sources
     usefulChangeSources = []
     for cs in branchObjects['change_source']:
         if cs.branch not in [x.branch for x in buildObjects['change_source'] + usefulChangeSources]:
             usefulChangeSources.append(cs)
     branchObjects['change_source'] = usefulChangeSources
     buildObjects = mergeBuildObjects(buildObjects, branchObjects)
 
-for branch in ACTIVE_B2G_BRANCHES:
-    branchObjects = generateBranchObjects(B2G_BRANCHES[branch], branch)
-    # Strip away any duplicate change sources
-    usefulChangeSources = []
-    for cs in branchObjects['change_source']:
-        if cs.branch not in [x.branch for x in buildObjects['change_source'] + usefulChangeSources]:
-            usefulChangeSources.append(cs)
-    branchObjects['change_source'] = usefulChangeSources
-    buildObjects = mergeBuildObjects(buildObjects, branchObjects)
-
 for project in ACTIVE_PROJECTS:
     if PROJECTS[project].get('enable_try'):
         slaves = TRY_SLAVES
     else:
         slaves = SLAVES
     projectObjects = generateProjectObjects(project, PROJECTS[project], slaves)
     buildObjects = mergeBuildObjects(buildObjects, projectObjects)
 
--- a/mozilla/try_localconfig.py
+++ b/mozilla/try_localconfig.py
@@ -16,17 +16,16 @@ if 'http_port' in master_config:
 if 'ssh_port' in master_config:
     c['manhole'] = manhole.PasswordManhole(
             "tcp:%(ssh_port)i:interface=127.0.0.1" % master_config,
             "cltbld", "password")
 
 from config import BRANCHES, PROJECTS, TRY_SLAVES, BRANCH_PROJECTS
 ACTIVE_BRANCHES = ['try']
 ACTIVE_THUNDERBIRD_BRANCHES = ['try-comm-central']
-ACTIVE_B2G_BRANCHES = ['try']
 ACTIVE_RELEASE_BRANCHES = []
 ACTIVE_THUNDERBIRD_RELEASE_BRANCHES = []
 ACTIVE_MOBILE_RELEASE_BRANCHES = []
 ACTIVE_PROJECTS = [k for k,v in PROJECTS.items() if v.get('enable_try')]
 ACTIVE_BRANCH_PROJECTS = [k for k,v in BRANCH_PROJECTS.items() if v.get('enable_try')]
 
 # Override with TRY_SLAVES
 SLAVES = TRY_SLAVES
--- a/mozilla/universal_master_sqlite.cfg
+++ b/mozilla/universal_master_sqlite.cfg
@@ -5,25 +5,23 @@ import os, sys
 # NOTE: builder_master.cfg and universal_master_sqlite.cfg need to be kept in sync
 #       as much of the logic is duplicated between them.
 
 import buildbotcustom.misc
 import buildbotcustom.status.queued_command
 import master_common
 import config
 import thunderbird_config
-import b2g_config
 import master_localconfig
 import build.paths
 reload(buildbotcustom.misc)
 reload(buildbotcustom.status.queued_command)
 reload(master_common)
 reload(config)
 reload(thunderbird_config)
-reload(b2g_config)
 reload(master_localconfig)
 reload(build.paths)
 
 from master_common import BuildmasterConfig
 from build.paths import getRealpath
 
 c = BuildmasterConfig
 for key, value in master_localconfig.BuildmasterConfig.items():
@@ -39,22 +37,20 @@ commandsQueue = QueueDir('commands', '%s
 from buildbotcustom.status.queued_command import QueuedCommandHandler
 c['status'].append(QueuedCommandHandler(
     command=[sys.executable, os.path.join(os.path.dirname(buildbotcustom.__file__), 'bin', 'postrun.py'), '-c', os.path.abspath(os.path.join(os.curdir, 'postrun.cfg'))],
     queuedir=commandsQueue,
 ))
 
 from config import BRANCHES, PROJECTS
 from thunderbird_config import BRANCHES as THUNDERBIRD_BRANCHES
-from b2g_config import BRANCHES as B2G_BRANCHES
 from master_localconfig import (
     ACTIVE_BRANCHES, ACTIVE_PROJECTS, SLAVES, ENABLE_RELEASES,
     ACTIVE_RELEASE_BRANCHES, ACTIVE_MOBILE_RELEASE_BRANCHES,
-    ACTIVE_THUNDERBIRD_BRANCHES, ACTIVE_THUNDERBIRD_RELEASE_BRANCHES,
-    ACTIVE_B2G_BRANCHES)
+    ACTIVE_THUNDERBIRD_BRANCHES, ACTIVE_THUNDERBIRD_RELEASE_BRANCHES)
 
 import BuildSlaves
 reload(BuildSlaves)
 from BuildSlaves import SlavePasswords
 from buildbot.buildslave import BuildSlave
 
 for platform, names in SLAVES.items():
     for name in names:
@@ -82,27 +78,16 @@ for branch in ACTIVE_THUNDERBIRD_BRANCHE
     # Strip away any duplicate change sources
     usefulChangeSources = []
     for cs in branchObjects['change_source']:
         if cs.branch not in [x.branch for x in buildObjects['change_source'] + usefulChangeSources]:
             usefulChangeSources.append(cs)
     branchObjects['change_source'] = usefulChangeSources
     buildObjects = mergeBuildObjects(buildObjects, branchObjects)
 
-for branch in ACTIVE_B2G_BRANCHES:
-    branchObjects = generateBranchObjects(B2G_BRANCHES[branch], branch,
-            getattr(passwords, 'secrets', None))
-    # Strip away any duplicate change sources
-    usefulChangeSources = []
-    for cs in branchObjects['change_source']:
-        if cs.branch not in [x.branch for x in buildObjects['change_source'] + usefulChangeSources]:
-            usefulChangeSources.append(cs)
-    branchObjects['change_source'] = usefulChangeSources
-    buildObjects = mergeBuildObjects(buildObjects, branchObjects)
-
 for project in ACTIVE_PROJECTS:
     projectObjects = generateProjectObjects(project, PROJECTS[project], SLAVES)
     buildObjects = mergeBuildObjects(buildObjects, projectObjects)
 
 # Remove duplicate change sources
 for cs in buildObjects['change_source'][:]:
     while buildObjects['change_source'].count(cs) > 1:
         buildObjects['change_source'].remove(cs)
--- a/setup-master.py
+++ b/setup-master.py
@@ -207,17 +207,17 @@ def load_masters_json(masters_json, role
             globs=['config.py', 'thunderbird_config.py', '*_config.py',
                    '*_common.py', '*_project_branches.py',
                    'project_branches.py', 'gecko_versions.json'],
             renames=[('BuildSlaves.py.template', 'BuildSlaves.py'),
                      ('passwords.py.template', 'passwords.py')],
             local_links=[(environment_config, 'localconfig.py'),
                          ('thunderbird_' + environment_config,
                           'thunderbird_localconfig.py'),
-                         ('b2g_' + environment_config, 'b2g_localconfig.py')],
+                         ],
             extras=[('master_config.json',
                      json.dumps(m, indent=2, sort_keys=True))],
             log=log
         )
 
         if universal:
             c.name += '-universal'
             mastercfg = 'universal_master_sqlite.cfg'