Bug 791854 - Disable noion armv7 android builds/tests. r=aki
authorJustin Wood <Callek@gmail.com>
Mon, 17 Sep 2012 19:21:54 -0400
changeset 6869 6e05898683273812113baa455fb572b56f75e2de
parent 6868 092fc3e36d788182b177d651321698d83c72c685
child 6870 c970569804ab6163ab6c9d58370dfc2cba50291e
child 6871 f83dba522499aa0c1958e172f4cbb3ae62f4c7c9
push id5365
push userCallek@gmail.com
push dateTue, 18 Sep 2012 00:53:51 +0000
reviewersaki
bugs791854
Bug 791854 - Disable noion armv7 android builds/tests. r=aki Effectively backs out pertinent parts of changeset ee976dc0b77b and changeset df3cb47aacc7
mozilla-tests/BuildSlaves.py.template
mozilla-tests/config.py
mozilla-tests/production_addon_config.py
mozilla-tests/production_config.py
mozilla-tests/scheduler_master.cfg
mozilla-tests/staging_addon_config.py
mozilla-tests/staging_ateam_config.py
mozilla-tests/staging_config.py
mozilla-tests/tests_master.cfg
mozilla-tests/universal_master_sqlite.cfg
mozilla/BuildSlaves.py.template
mozilla/config.py
--- a/mozilla-tests/BuildSlaves.py.template
+++ b/mozilla-tests/BuildSlaves.py.template
@@ -10,11 +10,10 @@ SlavePasswords = {
     "lion": "pass",
     "mountainlion": "pass",
     "xp": "pass",
     "win7": "pass",
     "w764": "pass",
     "vista": "pass",
     "tegra_android": "pass",
     "tegra_android-armv6": "pass",
-    "tegra_android-noion": "pass",
 }
 
--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -70,17 +70,16 @@ PLATFORMS = {
     'macosx': {},
     'macosx64': {},
     'win32': {},
     'win64': {},
     'linux': {},
     'linux64' : {},
     'android': {},
     'android-armv6': {},
-    'android-noion': {},
 }
 
 # work around path length problem bug 599795
 # leopard-o == leopard-old
 PLATFORMS['macosx']['slave_platforms'] = ['leopard-o']
 PLATFORMS['macosx']['env_name'] = 'mac-perf'
 PLATFORMS['macosx']['leopard-o'] = {'name': "Rev3 MacOSX Leopard 10.5.8"}
 PLATFORMS['macosx']['stage_product'] = 'firefox'
@@ -132,24 +131,16 @@ PLATFORMS['android']['mozharness_python'
 
 PLATFORMS['android-armv6']['slave_platforms'] = ['tegra_android-armv6']
 PLATFORMS['android-armv6']['env_name'] = 'android-perf'
 PLATFORMS['android-armv6']['is_mobile'] = True
 PLATFORMS['android-armv6']['tegra_android-armv6'] = {'name': "Android Armv6 Tegra 250"}
 PLATFORMS['android-armv6']['stage_product'] = 'mobile'
 PLATFORMS['android-armv6']['mozharness_python'] = '/tools/buildbot/bin/python'
 
-PLATFORMS['android-noion']['slave_platforms'] = ['tegra_android-noion']
-PLATFORMS['android-noion']['env_name'] = 'android-perf'
-PLATFORMS['android-noion']['is_mobile'] = True
-PLATFORMS['android-noion']['tegra_android-noion'] = {'name': "Android no-ionmonkey Tegra 250"}
-PLATFORMS['android-noion']['stage_product'] = 'mobile'
-PLATFORMS['android-noion']['mozharness_python'] = '/tools/buildbot/bin/python'
-
-
 # Lets be explicit instead of magical.  leopard-o should be a second
 # entry in the SLAVE dict
 for platform, platform_config in PLATFORMS.items():
     for slave_platform in platform_config['slave_platforms']:
         platform_config[slave_platform]['slaves'] = sorted(SLAVES[slave_platform])
         if slave_platform in TRY_SLAVES:
             platform_config[slave_platform]['try_slaves'] = sorted(TRY_SLAVES[slave_platform])
         else:
@@ -345,17 +336,16 @@ BRANCH_UNITTEST_VARS = {
         'linux': {},
         'linux64': {},
         'macosx': {},
         'macosx64': {},
         'win32': {},
         'win64': {},
         'android': {},
         'android-armv6': {},
-        'android-noion': {},
     },
 }
 
 # Default set of unit tests
 UNITTEST_SUITES = {
     'opt_unittest_suites': [
         # Turn on chunks for mochitests
         ('mochitests', dict(suite='mochitest-plain', chunkByDir=4, totalChunks=5)),
@@ -633,25 +623,16 @@ ANDROID_UNITTEST_DICT = {
         ('robocop', (
             {'suite': 'mochitest-robocop',
             },
         )),
     ],
     'debug_unittest_suites': [],
 }
 
-ANDROID_NOION_UNITTEST_DICT = {
-    'opt_unittest_suites': [],
-    'debug_unittest_suites': [],
-}
-for suite in ANDROID_UNITTEST_DICT['opt_unittest_suites']:
-    if suite[0].startswith('reftest') or suite[0].startswith('crashtest'):
-        continue
-    ANDROID_NOION_UNITTEST_DICT['opt_unittest_suites'].append(suite)
-
 ANDROID_ARMV6_UNITTEST_DICT = deepcopy(ANDROID_UNITTEST_DICT)
 
 # 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 = {
         'linux': {
             'product_name': 'firefox',
             'app_name': 'browser',
@@ -771,27 +752,16 @@ PLATFORM_UNITTEST_VARS = {
             'brand_name': 'Minefield',
             'is_remote': True,
             'host_utils_url': 'http://bm-remote.build.mozilla.org/tegra/tegra-host-utils.%%(foopy_type)s.742597.zip',
             'enable_opt_unittests': True,
             'enable_debug_unittests': False,
             'remote_extras': ANDROID_UNITTEST_REMOTE_EXTRAS,
             'tegra_android-armv6': deepcopy(ANDROID_ARMV6_UNITTEST_DICT),
         },
-        'android-noion': {
-            'product_name': 'fennec',
-            'app_name': 'browser',
-            'brand_name': 'Minefield',
-            'is_remote': True,
-            'host_utils_url': 'http://bm-remote.build.mozilla.org/tegra/tegra-host-utils.%%(foopy_type)s.742597.zip',
-            'enable_opt_unittests': True,
-            'enable_debug_unittests': False,
-            'remote_extras': ANDROID_UNITTEST_REMOTE_EXTRAS,
-            'tegra_android-noion': deepcopy(ANDROID_NOION_UNITTEST_DICT),
-        },
 }
 
 # Copy project branches into BRANCHES keys
 for branch in ACTIVE_PROJECT_BRANCHES:
     BRANCHES[branch] = deepcopy(PROJECT_BRANCHES[branch])
 
 # Copy unittest vars in first, then platform vars
 for branch in BRANCHES.keys():
@@ -1097,24 +1067,16 @@ for branch in ['mozilla-central', 'try',
 #-------------------------------------------------------------------------
 for branch in ['mozilla-release', 'mozilla-esr10']:
     if 'android-armv6' in BRANCHES[branch]['platforms']:
         del BRANCHES[branch]['platforms']['android-armv6']
 #-------------------------------------------------------------------------
 # End enable android-armv6 tests for FF18 onwards
 #-------------------------------------------------------------------------
 
-# XXX Bug 789373 hack - add android-noion until we have b2g testing
-# Delete all references to android-noion once we have b2g testing
-for branch in BRANCHES:
-    if branch not in ('mozilla-central', 'mozilla-inbound', 'try'):
-        if 'android-noion' in BRANCHES[branch]['platforms']:
-            del BRANCHES[branch]['platforms']['android-noion']
-
-
 if __name__ == "__main__":
     import sys, pprint, re
 
     class BBPrettyPrinter(pprint.PrettyPrinter):
         def format(self, object, context, maxlevels, level):
             if isinstance(object, WithProperties):
                 return pprint.PrettyPrinter.format(self, object.fmtstring, context, maxlevels, level)
             return pprint.PrettyPrinter.format(self, object, context, maxlevels, level)
--- a/mozilla-tests/production_addon_config.py
+++ b/mozilla-tests/production_addon_config.py
@@ -5,17 +5,16 @@ SLAVES = {
     'win7': dict([("addon-r3-w7-%03i" % x, {}) for x in range(1,4)]),
     'w764': dict([("addon-r3-w764-%03i" % x, {}) for x in range(1,4)]),
     'leopard': dict([("addon-r3-leopard-%03i" % x, {}) for x in range(1,4)]),
     'snowleopard': dict([("addon-r3-snow-%03i" % x, {}) for x in range(1,4)]),
     'tegra_android': dict([('tegra-%03i' % x, {'http_port': '30%03i' % x, 'ssl_port': '31%03i' % x}) for x in range(1,4)]),
 }
 
 SLAVES['tegra_android-armv6'] = SLAVES['tegra_android']
-SLAVES['tegra_android-noion'] = SLAVES['tegra_android']
 
 TRY_SLAVES = {}
 
 GRAPH_CONFIG = ['--resultsServer', 'graphs.mozilla.org',
     '--resultsLink', '/server/collect.cgi']
 
 GLOBAL_VARS = {
     'build_tools_repo_path': 'build/tools',
--- a/mozilla-tests/production_config.py
+++ b/mozilla-tests/production_config.py
@@ -14,17 +14,16 @@ SLAVES = {
         for x in range(31,371) \
         if x not in range(122,129) + [30,31,33,34,43,44,49,65,69,77,131,137,143,147,\
             153,156,161,175,176,180,184,185,186,193,197,198,202,203,204,205,222,224,\
             226,239,241,268,275,289,291,292,301]]), # decommissioned tegras
 }
 
 SLAVES['leopard-o'] = SLAVES['leopard']
 SLAVES['tegra_android-armv6'] = SLAVES['tegra_android']
-SLAVES['tegra_android-noion'] = SLAVES['tegra_android']
 
 TRY_SLAVES = {}
 
 GRAPH_CONFIG = ['--resultsServer', 'graphs.mozilla.org',
     '--resultsLink', '/server/collect.cgi']
 
 GLOBAL_VARS = {
     'disable_tinderbox_mail': True,
--- a/mozilla-tests/scheduler_master.cfg
+++ b/mozilla-tests/scheduler_master.cfg
@@ -46,17 +46,17 @@ buildObjects = {}
 
 for branch in ACTIVE_BRANCHES:
     talosObjects = generateTalosBranchObjects(branch, BRANCHES[branch],
                                                ACTIVE_PLATFORMS, SUITES,
                                                BRANCH_UNITTEST_VARS['platforms'])
     buildObjects = mergeBuildObjects(buildObjects, talosObjects)
 
 #XXX we should not have these mobile platforms in Thunderbird to begin with
-for b in ['android', 'android-armv6', 'android-noion']:
+for b in ['android', 'android-armv6']:
     if b in ACTIVE_THUNDERBIRD_PLATFORMS:
         del ACTIVE_THUNDERBIRD_PLATFORMS[b]
 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)
 
--- a/mozilla-tests/staging_addon_config.py
+++ b/mozilla-tests/staging_addon_config.py
@@ -5,17 +5,16 @@ SLAVES = {
     'win7': dict([("addon-r3-w7-%03i" % x, {}) for x in range(1,4)]),
     'w764': dict([("addon-r3-w764-%03i" % x, {}) for x in range(1,4)]),
     'leopard': dict([("addon-r3-leopard-%03i" % x, {}) for x in range(1,4)]),
     'snowleopard': dict([("addon-r3-snow-%03i" % x, {}) for x in range(1,4)]),
     'tegra_android': dict([('tegra-%03i' % x, {'http_port': '30%03i' % x, 'ssl_port': '31%03i' % x}) for x in range(1,4)]),
 }
 
 SLAVES['tegra_android-armv6'] = SLAVES['tegra_android']
-SLAVES['tegra_android-noion'] = SLAVES['tegra_android']
 
 TRY_SLAVES = {}
 
 GRAPH_CONFIG = ['--resultsServer', 'graphs.allizom.org',
     '--resultsLink', '/server/collect.cgi']
 
 GLOBAL_VARS = {
     'tinderbox_tree': 'MozillaTest',
--- a/mozilla-tests/staging_ateam_config.py
+++ b/mozilla-tests/staging_ateam_config.py
@@ -5,17 +5,16 @@ SLAVES = {
     'win7': dict([("tools-r3-w7-%03i" % x, {}) for x in range(1,4)]),
     'w764': dict([("tools-r3-w764-%03i" % x, {}) for x in range(1,4)]),
     'leopard': dict([("tools-r3-leopard-%03i" % x, {}) for x in range(1,4)]),
     'snowleopard': dict([("tools-r3-snow-%03i" % x, {}) for x in range(1,4)]),
     'tegra_android': dict([('tegra-%03i' % x, {'http_port': '30%03i' % x, 'ssl_port': '31%03i' % x}) for x in range(1,4)]),
 }
 
 SLAVES['tegra_android-armv6'] = SLAVES['tegra_android']
-SLAVES['tegra_android-noion'] = SLAVES['tegra_android']
 
 TRY_SLAVES = {}
 
 GRAPH_CONFIG = ['--resultsServer', 'graphs.allizom.org',
     '--resultsLink', '/server/collect.cgi']
 
 GLOBAL_VARS = {
     'tinderbox_tree': 'MozillaTest',
--- a/mozilla-tests/staging_config.py
+++ b/mozilla-tests/staging_config.py
@@ -12,17 +12,16 @@ STAGING_SLAVES = {
     'mountainlion': dict([("talos-mtnlion-r5-%03i" % x, {}) for x in [1, 2, 3, 10]]),
     'tegra_android': dict(
         [('tegra-%03i' % x, {'http_port': '30%03i' % x, 'ssl_port': '31%03i' % x}) for x in range(10,30)]
     ),
 }
 
 STAGING_SLAVES['leopard-o'] = STAGING_SLAVES['leopard']
 STAGING_SLAVES['tegra_android-armv6'] = STAGING_SLAVES['tegra_android']
-STAGING_SLAVES['tegra_android-noion'] = STAGING_SLAVES['tegra_android']
 
 SLAVES = deepcopy(STAGING_SLAVES)
 
 for p, slaves in pc.SLAVES.items() + pc.TRY_SLAVES.items():
     if p not in SLAVES:
         SLAVES[p] = deepcopy(slaves)
     else:
         SLAVES[p] = dict(SLAVES[p].items() + slaves.items())
--- a/mozilla-tests/tests_master.cfg
+++ b/mozilla-tests/tests_master.cfg
@@ -95,17 +95,17 @@ buildObjects = {}
 
 for branch in ACTIVE_BRANCHES:
     talosObjects = generateTalosBranchObjects(branch, BRANCHES[branch],
                                                 ACTIVE_PLATFORMS, BRANCHES[branch].get('suites', SUITES),
                                                 BRANCH_UNITTEST_VARS['platforms'])
     buildObjects = mergeBuildObjects(buildObjects, talosObjects)
 
 #XXX we should not have these mobile platforms in Thunderbird to begin with
-for b in ['android', 'android-armv6', 'android-noion']:
+for b in ['android', 'android-armv6']:
     if b in ACTIVE_THUNDERBIRD_PLATFORMS:
         del ACTIVE_THUNDERBIRD_PLATFORMS[b]
 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)
--- a/mozilla-tests/universal_master_sqlite.cfg
+++ b/mozilla-tests/universal_master_sqlite.cfg
@@ -92,17 +92,17 @@ buildObjects = {}
 
 for branch in ACTIVE_BRANCHES:
     talosObjects = generateTalosBranchObjects(branch, BRANCHES[branch],
                                                 ACTIVE_PLATFORMS, BRANCHES[branch].get('suites', SUITES),
                                                 BRANCH_UNITTEST_VARS['platforms'])
     buildObjects = mergeBuildObjects(buildObjects, talosObjects)
 
 #XXX we should not have these mobile platforms in Thunderbird to begin with
-for b in ['android', 'android-armv6', 'android-noion']:
+for b in ['android', 'android-armv6']:
     if b in ACTIVE_THUNDERBIRD_PLATFORMS:
         del ACTIVE_THUNDERBIRD_PLATFORMS[b]
 
 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'])
--- a/mozilla/BuildSlaves.py.template
+++ b/mozilla/BuildSlaves.py.template
@@ -7,15 +7,14 @@ SlavePasswords = {
         'win64-metro': 'pass',
         'try-win32': 'pass',
         'macosx': 'pass',
         'macosx64': 'pass',
         'macosx64-lion': 'pass',
         'try-macosx': 'pass',
         'android': 'pass',
         'android-armv6': 'pass',
-        'android-noion': 'pass',
         'mock': 'pass'
         }
 tuxedoUsername = 'user'
 tuxedoPassword = 'passwd'
 balrog_username = 'user'
 balrog_password = 'passwd'
--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -58,17 +58,16 @@ GLOBAL_VARS = {
         'macosx64': {},
         'linux-debug': {},
         'linux64-debug': {},
         'macosx-debug': {},
         'macosx64-debug': {},
         'win32-debug': {},
         'android': {},
         'android-armv6': {},
-        'android-noion': {},
         'android-debug': {},
     },
     'pgo_strategy': None,
     'pgo_platforms': ('linux', 'linux64', 'win32', 'win64'),
     'periodic_pgo_interval': 6, # in hours
     'enable_shark': True,
     'enable_blocklist_update': False,
     'blocklist_update_on_closed_tree': False,
@@ -714,73 +713,16 @@ PLATFORM_VARS = {
             'stage_product': 'mobile',
             'android_signing': True,
             'post_upload_include_platform': True,
             'is_mobile_l10n': False,
             'multi_locale': True,
             'multi_locale_script': 'scripts/multil10n.py',
             'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android-armv6/releng.manifest',
         },
-        'android-noion': {
-            'product_name': 'firefox',
-            'app_name': 'browser',
-            'brand_name': 'Minefield',
-            'base_name': 'Android no-ionmonkey %(branch)s',
-            'mozconfig': 'android/%(branch)s/nightly',
-            'src_mozconfig': 'mobile/android/config/mozconfigs/android-noion/nightly',
-            'mobile_dir': 'mobile/android',
-            'enable_xulrunner': False,
-            'profiled_build': False,
-            'builds_before_reboot': localconfig.BUILDS_BEFORE_REBOOT,
-            'build_space': 6,
-            'upload_symbols': False,
-            'download_symbols': False,
-            'packageTests': True,
-            'enable_codesighs': False,
-            'create_partial': False,
-            'slaves': SLAVES['mock'],
-            'platform_objdir': OBJDIR,
-            'update_platform': 'Android_arm-eabi-gcc3-noion',
-            'enable_ccache': True,
-            'enable_shared_checkouts': True,
-            'create_snippet': False,
-            'create_partial': False,
-            'use_mock': True,
-            'mock_target': 'mozilla-centos6-i386',
-            'mock_packages': ['autoconf213', 'mozilla-python27-mercurial', 'ccache', 'android-sdk15', 'android-sdk16', 'android-ndk5', 'zip', 'java-1.6.0-openjdk-devel', 'zlib-devel', 'glibc-static', 'openssh-clients', "mpfr"],
-            'env': {
-                'DISPLAY': ':2',
-                'HG_SHARE_BASE_DIR': '/builds/hg-shared',
-                'MOZ_OBJDIR': OBJDIR,
-                'SYMBOL_SERVER_HOST': localconfig.SYMBOL_SERVER_HOST,
-                'SYMBOL_SERVER_USER': 'ffxbld',
-                'SYMBOL_SERVER_PATH': SYMBOL_SERVER_MOBILE_PATH,
-                'SYMBOL_SERVER_SSH_KEY': "/home/mock_mozilla/.ssh/ffxbld_dsa",
-                'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
-                'TINDERBOX_OUTPUT': '1',
-                'MOZ_CRASHREPORTER_NO_REPORT': '1',
-                'CCACHE_DIR': '/builds/ccache',
-                'CCACHE_COMPRESS': '1',
-                'CCACHE_UMASK': '002',
-                'LC_ALL': 'C',
-                'JAVA_HOME': '/tools/jdk6',
-                'PATH': '/tools/jdk6/bin:/opt/local/bin:/tools/python/bin:/tools/buildbot/bin:/usr/kerberos/bin:/usr/local/bin:/bin:/usr/bin:/home/',
-                'PYTHON26': '/tools/python-2.6.5/bin/python',
-            },
-            'enable_opt_unittests': False,
-            'talos_masters': GLOBAL_VARS['talos_masters'],
-            'unittest_masters': GLOBAL_VARS['unittest_masters'],
-            'stage_platform': "android-noion",
-            'stage_product': 'mobile',
-            'android_signing': True,
-            'post_upload_include_platform': True,
-            'is_mobile_l10n': False,
-            'multi_locale': False,
-            'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android/releng.manifest',
-        },
         'android-debug': {
             'product_name': 'firefox',
             'app_name': 'browser',
             'brand_name': 'Minefield',
             'base_name': 'Android Debug %(branch)s',
             'mozconfig': 'android-debug/%(branch)s/nightly',
             'src_mozconfig': 'mobile/android/config/mozconfigs/android/debug',
             'mobile_dir': 'mobile/android',
@@ -1325,24 +1267,22 @@ BRANCHES['try']['platforms']['win32']['s
 BRANCHES['try']['platforms']['win64']['slaves'] = TRY_SLAVES['win64']
 BRANCHES['try']['platforms']['macosx64']['slaves'] = TRY_SLAVES['macosx64-lion']
 BRANCHES['try']['platforms']['linux-debug']['slaves'] = TRY_SLAVES['linux']
 BRANCHES['try']['platforms']['linux64-debug']['slaves'] = TRY_SLAVES['linux64']
 BRANCHES['try']['platforms']['win32-debug']['slaves'] = TRY_SLAVES['win64']
 BRANCHES['try']['platforms']['macosx64-debug']['slaves'] = TRY_SLAVES['macosx64-lion']
 BRANCHES['try']['platforms']['android']['slaves'] = TRY_SLAVES['mock']
 BRANCHES['try']['platforms']['android-armv6']['slaves'] = TRY_SLAVES['mock']
-BRANCHES['try']['platforms']['android-noion']['slaves'] = TRY_SLAVES['mock']
 BRANCHES['try']['platforms']['android-debug']['slaves'] = TRY_SLAVES['mock']
 BRANCHES['try']['platforms']['linux']['upload_symbols'] = False
 BRANCHES['try']['platforms']['linux64']['upload_symbols'] = False
 BRANCHES['try']['platforms']['macosx64']['upload_symbols'] = False
 BRANCHES['try']['platforms']['android']['upload_symbols'] = False
 BRANCHES['try']['platforms']['android-armv6']['upload_symbols'] = False
-BRANCHES['try']['platforms']['android-noion']['upload_symbols'] = False
 BRANCHES['try']['platforms']['android-debug']['upload_symbols'] = False
 BRANCHES['try']['platforms']['win32']['upload_symbols'] = True
 BRANCHES['try']['platforms']['win32']['env']['SYMBOL_SERVER_USER'] = 'trybld'
 BRANCHES['try']['platforms']['win32']['env']['SYMBOL_SERVER_PATH'] = '/symbols/windows'
 BRANCHES['try']['platforms']['win32']['env']['SYMBOL_SERVER_SSH_KEY'] = '/c/Documents and Settings/cltbld/.ssh/trybld_dsa'
 BRANCHES['try']['platforms']['win64']['upload_symbols'] = False
 for platform in BRANCHES['try']['platforms'].keys():
     # Sadly, the rule that mobile builds go to /mobile/
@@ -1404,18 +1344,16 @@ for branch in ACTIVE_PROJECT_BRANCHES:
         '/home/ftp/pub/mozilla.org/firefox/nightly/latest-' + branch + '-l10n/'
     BRANCHES[branch]['enUS_binaryURL'] = GLOBAL_VARS['download_base_url'] + branchConfig.get('enUS_binaryURL', '')
     if BRANCHES[branch]['platforms'].has_key('linux'):
         BRANCHES[branch]['platforms']['linux']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = branch
     if BRANCHES[branch]['platforms'].has_key('android'):
         BRANCHES[branch]['platforms']['android']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = 'android-' + branch
     if BRANCHES[branch]['platforms'].has_key('android-armv6'):
         BRANCHES[branch]['platforms']['android-armv6']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = 'android-armv6-' + branch
-    if BRANCHES[branch]['platforms'].has_key('android-noion'):
-        BRANCHES[branch]['platforms']['android-noion']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = 'android-armv6-' + branch
     if BRANCHES[branch]['platforms'].has_key('linux64'):
         BRANCHES[branch]['platforms']['linux64']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = 'linux64-' + branch
     if BRANCHES[branch]['platforms'].has_key('win32'):
         BRANCHES[branch]['platforms']['win32']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = branch
     if BRANCHES[branch]['platforms'].has_key('win64'):
         BRANCHES[branch]['platforms']['win64']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = 'win64-' + branch
     if BRANCHES[branch]['platforms'].has_key('macosx64'):
         BRANCHES[branch]['platforms']['macosx64']['env']['MOZ_SYMBOLS_EXTRA_BUILDID'] = 'macosx64-' + branch
@@ -1481,23 +1419,16 @@ for b in ('mozilla-beta', 'mozilla-relea
 
 for b in ('mozilla-aurora', 'mozilla-beta', 'mozilla-release', 'mozilla-esr10'):
     # Disable pymake
     for p in ('win32', 'win32-debug', 'win32-metro', 'win64'):
         if p not in BRANCHES[b]['platforms']:
             continue
         BRANCHES[b]['platforms'][p]['enable_pymake'] = False
 
-# XXX bug 789373 hack until we get b2g testing going.
-# Delete all references to android-noion once we have b2g tests.
-for b in BRANCHES.keys():
-    if b not in ('mozilla-central', 'mozilla-inbound', 'try'):
-        if 'android-noion' in BRANCHES[b]['platforms']:
-            del BRANCHES[b]['platforms']['android-noion']
-
 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: