bug 580322 - remove old mobile testing configs r=aki p=jhford
authorJohn Ford <jhford@mozilla.com>
Tue, 20 Jul 2010 11:41:32 -0700
changeset 2709 7a02ba4ed3ac5a5a12fa2f4ba1ce913c6be6fd9b
parent 2708 8f29addda6544e20450fbaed0e882bd52eba35cf
child 2710 6a404df5969d42747235b411550c797ca03c60fa
push id2116
push userjford@mozilla.com
push dateTue, 20 Jul 2010 18:41:51 +0000
reviewersaki
bugs580322
bug 580322 - remove old mobile testing configs r=aki p=jhford
mobile-rw/config-production.py
mobile-rw/config-staging.py
mobile-rw/defaults.py
mobile-rw/master.cfg
mobile-staging/config.py
mobile-staging/master.cfg
mobile/config-production.py
mobile/config-staging.py
mobile/config.py
mobile/defaults.py
mobile/master.cfg
deleted file mode 100644
--- a/mobile-rw/master.cfg
+++ /dev/null
@@ -1,174 +0,0 @@
-from buildbot.buildslave import BuildSlave
-from buildbot.changes.pb import PBChangeSource
-from buildbot.scheduler import Scheduler, Periodic
-from buildbot.status import html, tinderbox
-from buildbot.status.mail import MailNotifier
-
-import buildbotcustom.process.mobiletestfactoryrw
-reload(buildbotcustom.process.mobiletestfactoryrw)
-from buildbotcustom.process.mobiletestfactoryrw import MobileUnittestFactory, \
- MobileTalosFactory
-
-import buildbotcustom.changes.mobileftppoller
-reload(buildbotcustom.changes.mobileftppoller)
-from buildbotcustom.changes.mobileftppoller import MobileFtpPoller
-
-import config
-reload(config)
-from config import MASTER, BRANCHES, SLAVES
-
-c = BuildmasterConfig = {}
-c['debugPassword'] = "mozilla"
-c['projectName'] = MASTER['name']
-c['projectURL'] = "http://%s.build.mozilla.org:%d/" % (MASTER['name'], MASTER['http_port'])
-c['buildbotURL'] = "http://%s.build.mozilla.org:%d/" % (MASTER['name'], MASTER['http_port'])
-c['slavePortnum'] = MASTER['slave_port']
-
-c['change_source'] = []
-c['change_source'].append(PBChangeSource())
-
-c['slaves'] = []
-for platform, names in SLAVES.items():
-    for name in names:
-        c['slaves'].append(BuildSlave(name, 'm0b1l3', max_builds=1))
-
-c['status'] = []
-c['status'].append(html.WebStatus(http_port=MASTER['http_port'], allowForce=True))
-
-c['status'].append(MailNotifier(
-    fromaddr="cltbld@%s.build.mozilla.org" % MASTER['name'],
-    sendToInterestedUsers=False,
-    extraRecipients=MASTER['admin_emails'],
-    mode="failing",
-    builders=None,
-    relayhost="smtp.mozilla.org"
-))
-
-c['schedulers'] = []
-c['builders'] = []
-
-for branch_name in sorted(BRANCHES.keys()):
-    branch=BRANCHES[branch_name]
-    branch_builders=[]
-
-    for platform_name in sorted(branch['platforms'].keys()):
-        unittest_builders = []
-        talos_builders = []
-        bb_branch= "%s-%s" % (branch_name, platform_name)
-        platform = branch['platforms'][platform_name]
-
-        c['change_source'].append(MobileFtpPoller(
-            tree=branch_name,
-            branch='%s-talos' % bb_branch,
-            pollInterval=platform['poll_interval'],
-            ftpURLs=platform['talos_build_dirs'],
-            idleTimeout=2*60*60,
-            searchString=platform['poller_string'],
-        ))
-        c['change_source'].append(MobileFtpPoller(
-            tree=branch_name,
-            branch='%s-unit' % bb_branch,
-            pollInterval=platform['poll_interval'],
-            ftpURLs=platform['unit_build_dirs'],
-            searchString=platform['poller_string'],
-        ))
-        # Talos suites
-        for suite_name in sorted(platform['talos_suites'].keys()):
-            suite = platform['talos_suites'][suite_name]
-            if 'nochrome' in suite_name:
-                nochrome = True
-                short_name = suite_name.replace('_nochrome','')
-                #the replace is because we supply nochrome as a command
-                #line argument to the tp4 test instead of having a seperate
-                #tp4_nochrome test
-            else:
-                short_name = suite_name
-                nochrome = False
-
-            talos_factory = MobileTalosFactory(
-                test=short_name,
-                timeout=suite['timeout'],
-                browser_wait=platform['browser_wait'],
-                talos_config_file=suite['config_file'],
-                results_server=branch['graph_server'],
-                branch=platform['talos_branch'],
-                talos_tarball=platform.get('talos_tarball'),
-                pageloader_tarball=platform.get('pageloader_tarball'),
-                reboot=platform['reboot'],
-                reboot_cmd=platform['reboot_cmd'],
-                nochrome=nochrome
-            )
-            builder_name = "%s %s talos %s" % (platform_name, branch_name,
-                                               suite_name)
-            talos_builder = {
-                'name': builder_name,
-                'slavenames': platform['slaves'],
-                'builddir': "%s-%s-%s" % (platform_name, branch_name, suite_name),
-                'slavebuilddir': '/builds/slave_build_dir',
-                'factory': talos_factory,
-                'category': bb_branch,
-            }
-            c['builders'].append(talos_builder)
-            talos_builders.append(builder_name)
-            branch_builders.append(builder_name)
-        # Unit test suites
-        for test_name in sorted(platform['test_suites'].keys()):
-            test = platform['test_suites'][test_name]
-            test_factory = MobileUnittestFactory(
-                test=test_name,
-                timeout=test['timeout'],
-                test_type=test['test_type'],
-                known_fail_count=test['known_fail_count'],
-                clients=test.get('clients'),
-                maemkit_tarball=platform.get('maemkit_tarball'),
-                reboot=platform['reboot'],
-                reboot_cmd=platform['reboot_cmd'],
-            )
-            test_builder = {
-                'name': "%s %s unit %s" % (platform_name, branch_name, test_name),
-                'slavenames': platform['slaves'],
-                'builddir': "%s-%s-%s" % (platform_name, branch_name, test_name),
-                'factory': test_factory,
-                'category': bb_branch,
-            }
-            c['builders'].append(test_builder)
-            unittest_builders.append(test_builder['name'])
-            branch_builders.append(test_builder['name'])
-
-        c['schedulers'].append(Scheduler(
-            name="%s %s talos scheduler" % (platform_name, branch_name),
-            branch='%s-talos' % bb_branch,
-            treeStableTimer=branch['tree_stable_timer'],
-            builderNames=talos_builders,
-        ))
-        c['schedulers'].append(Scheduler(
-            name="%s %s unit scheduler" % (platform_name, branch_name),
-            branch='%s-unit' % bb_branch,
-            treeStableTimer=branch['tree_stable_timer'],
-            builderNames=unittest_builders,
-        ))
-        c['schedulers'].append(Scheduler(
-            name="%s %s scheduler" % (platform_name, branch_name),
-            branch='%s' % bb_branch,
-            treeStableTimer=branch['tree_stable_timer'],
-            builderNames=unittest_builders+talos_builders,
-        ))
-
-        c['status'].append(tinderbox.TinderboxMailNotifier(
-            fromaddr="mobile.buildbot@build.mozilla.org",
-            tree=branch['tinderbox_tree'],
-            extraRecipients=["tinderbox-daemon@tinderbox.mozilla.org"],
-            relayhost="smtp.mozilla.org",
-            builders=talos_builders,
-            logCompression="bzip2"
-        ))
-        c['status'].append(tinderbox.TinderboxMailNotifier(
-            fromaddr="mobile.buildbot@build.mozilla.org",
-            tree=branch['tinderbox_tree'],
-            extraRecipients=["tinderbox-daemon@tinderbox.mozilla.org"],
-            relayhost="smtp.mozilla.org",
-            builders=unittest_builders,
-            logCompression="bzip2",
-            errorparser="unittest"
-        ))
-
deleted file mode 100644
--- a/mobile-staging/config.py
+++ /dev/null
@@ -1,263 +0,0 @@
-SLAVES = {
-    'n810': ['maemo-n810-%02i' % x for x in [1,3,4,5,6] + range(9,81)],
-}
-
-BRANCHES = {
-    'mozilla-central': {},
-    'mozilla-1.9.2': {},
-    'tracemonkey'  : {},
-}
-
-#
-# {{{1 mozilla-central
-#
-BRANCHES['mozilla-central']['tinderbox_tree'] = "MozillaTest"
-BRANCHES['mozilla-central']['graph_server'] = "graphs-stage.mozilla.org"
-BRANCHES['mozilla-central']['platforms'] = {
-    'n810': {},
-}
-BRANCHES['mozilla-central']['platforms']['n810']['base_name'] = 'Maemo mozilla-central'
-BRANCHES['mozilla-central']['platforms']['n810']['slaves'] = SLAVES['n810']
-BRANCHES['mozilla-central']['platforms']['n810']['buildbot_branch'] = 'maemo-trunk'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_branch'] = 'mobile'
-BRANCHES['mozilla-central']['platforms']['n810']['poll_interval'] = 5*60
-BRANCHES['mozilla-central']['platforms']['n810']['unit_build_dirs'] = [
-    'http://ftp.mozilla.org/pub/mozilla.org/mobile/tinderbox-builds/mobile-trunk/',
-    'http://ftp.mozilla.org/pub/mozilla.org/mobile/nightly/latest-mobile-trunk/',
-]
-BRANCHES['mozilla-central']['platforms']['n810']['talos_build_dirs'] = [
-    'http://ftp.mozilla.org/pub/mozilla.org/mobile/tinderbox-builds/mobile-trunk/',
-    'http://ftp.mozilla.org/pub/mozilla.org/mobile/nightly/latest-mobile-trunk/',
-]
-BRANCHES['mozilla-central']['platforms']['n810']['poller_string'] = 'fennec-.*\.en-US\.linux.*arm\.tar\.bz2'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_scripts'] = 'http://staging-mobile-master.build.mozilla.org/maemo/talos.tar.bz2'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_pageloader'] = 'http://staging-mobile-master.build.mozilla.org/maemo/pageloader.tar.bz2'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites'] = {
-    'tp4': {},
-    'tp4_nochrome': {},
-    'tpan': {},
-    'tzoom': {},
-    'ts': {},
-    'twinopen': {},
-    'tdhtml': {},
-    'tsvg': {},
-    'tsspider': {},
-    'tgfx': {},
-}
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tp4']['suite_name'] = 'N810 mozilla-central talos Tp4'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tp4']['build_dir'] = 'n810-trunk-tp4'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tp4']['config_file'] = 'mobile.config'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tp4']['timeout'] = 90
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tp4_nochrome']['suite_name'] = 'N810 mozilla-central talos Tp4 nochrome'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tp4_nochrome']['build_dir'] = 'n810-trunk-tp4-nochrome'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tp4_nochrome']['config_file'] = 'mobile.config'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tp4_nochrome']['timeout'] = 90
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tpan']['suite_name'] = 'N810 mozilla-central talos Tpan'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tpan']['build_dir'] = 'n810-trunk-tpan'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tpan']['config_file'] = 'mobile.config'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tpan']['timeout'] = 90
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tzoom']['suite_name'] = 'N810 mozilla-central talos Tzoom'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tzoom']['build_dir'] = 'n810-trunk-tzoom'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tzoom']['config_file'] = 'mobile.config'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tzoom']['timeout'] = 90
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['ts']['suite_name'] = 'N810 mozilla-central talos Ts'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['ts']['build_dir'] = 'n810-trunk-ts'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['ts']['config_file'] = 'mobile.config'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['ts']['timeout'] = 60
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['twinopen']['suite_name'] = 'N810 mozilla-central talos Twinopen'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['twinopen']['build_dir'] = 'n810-trunk-twinopen'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['twinopen']['config_file'] = 'mobile.config'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['twinopen']['timeout'] = 60
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tdhtml']['suite_name'] = 'N810 mozilla-central talos Tdhtml'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tdhtml']['build_dir'] = 'n810-trunk-tdhtml'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tdhtml']['config_file'] = 'mobile.config'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tdhtml']['timeout'] = 60
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tsvg']['suite_name'] = 'N810 mozilla-central talos Tsvg'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tsvg']['build_dir'] = 'n810-trunk-tsvg'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tsvg']['config_file'] = 'mobile.config'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tsvg']['timeout'] = 60
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tsspider']['suite_name'] = 'N810 mozilla-central talos Tsspider'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tsspider']['build_dir'] = 'n810-trunk-tsspider'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tsspider']['config_file'] = 'mobile.config'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tsspider']['timeout'] = 60
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tgfx']['suite_name'] = 'N810 mozilla-central talos Tgfx'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tgfx']['build_dir'] = 'n810-trunk-tgfx'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tgfx']['config_file'] = 'mobile.config'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tgfx']['timeout'] = 60
-BRANCHES['mozilla-central']['platforms']['n810']['test_suites'] = {
-    'reftest':    {},
-    'crashtest':  {},
-    'xpcshell':   {},
-}
-BRANCHES['mozilla-central']['platforms']['n810']['test_suites']['reftest']['knownFailCount'] = 310
-BRANCHES['mozilla-central']['platforms']['n810']['test_suites']['crashtest']['knownFailCount'] = 4
-BRANCHES['mozilla-central']['platforms']['n810']['test_suites']['xpcshell']['knownFailCount'] = 182
-
-#
-# {{{1 mozilla-1.9.2
-#
-BRANCHES['mozilla-1.9.2']['tinderbox_tree'] = "MozillaTest"
-BRANCHES['mozilla-1.9.2']['graph_server'] = "graphs-stage.mozilla.org"
-BRANCHES['mozilla-1.9.2']['platforms'] = {
-    'n810': {},
-}
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['base_name'] = 'Maemo mozilla-1.9.2'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['slaves'] = SLAVES['n810']
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['buildbot_branch'] = 'maemo-1.9.2'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_branch'] = 'mobile-1.9.2'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['poll_interval'] = 5*60
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['unit_build_dirs'] = [
-    'http://ftp.mozilla.org/pub/mozilla.org/mobile/tinderbox-builds/mobile-1.9.2/',
-    'http://ftp.mozilla.org/pub/mozilla.org/mobile/nightly/latest-mobile-1.9.2/',
-]
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_build_dirs'] = [
-    'http://ftp.mozilla.org/pub/mozilla.org/mobile/nightly/latest-mobile-1.9.2/',
-    'http://ftp.mozilla.org/pub/mozilla.org/mobile/tinderbox-builds/mobile-1.9.2/',
-]
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['poller_string'] = 'fennec-.*\.en-US\.linux.*arm\.tar\.bz2'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_scripts'] = 'http://staging-mobile-master.build.mozilla.org/maemo/talos.tar.bz2'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_pageloader'] = 'http://staging-mobile-master.build.mozilla.org/maemo/pageloader.tar.bz2'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites'] = {
-    'tp4': {},
-    'tp4_nochrome': {},
-    'tpan': {},
-    'tzoom': {},
-    'ts': {},
-    'twinopen': {},
-    'tdhtml': {},
-    'tsvg': {},
-    'tsspider': {},
-    'tgfx': {},
-}
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tp4']['suite_name'] = 'N810 mozilla-1.9.2 talos Tp4'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tp4']['build_dir'] = 'n810-1.9.2-tp4'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tp4']['config_file'] = 'mobile.config'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tp4']['timeout'] = 90
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tp4_nochrome']['suite_name'] = 'N810 mozilla-1.9.2 talos Tp4 nochrome'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tp4_nochrome']['build_dir'] = 'n810-1.9.2-tp4-nochrome'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tp4_nochrome']['config_file'] = 'mobile.config'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tp4_nochrome']['timeout'] = 90
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tpan']['suite_name'] = 'N810 mozilla-1.9.2 talos Tpan'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tpan']['build_dir'] = 'n810-1.9.2-tpan'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tpan']['config_file'] = 'mobile.config'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tpan']['timeout'] = 90
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tzoom']['suite_name'] = 'N810 mozilla-1.9.2 talos Tzoom'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tzoom']['build_dir'] = 'n810-1.9.2-tzoom'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tzoom']['config_file'] = 'mobile.config'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tzoom']['timeout'] = 90
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['ts']['suite_name'] = 'N810 mozilla-1.9.2 talos Ts'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['ts']['build_dir'] = 'n810-1.9.2-ts'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['ts']['config_file'] = 'mobile.config'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['ts']['timeout'] = 60
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['twinopen']['suite_name'] = 'N810 mozilla-1.9.2 talos Twinopen'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['twinopen']['build_dir'] = 'n810-1.9.2-twinopen'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['twinopen']['config_file'] = 'mobile.config'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['twinopen']['timeout'] = 60
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tdhtml']['suite_name'] = 'N810 mozilla-1.9.2 talos Tdhtml'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tdhtml']['build_dir'] = 'n810-1.9.2-tdhtml'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tdhtml']['config_file'] = 'mobile.config'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tdhtml']['timeout'] = 60
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tsvg']['suite_name'] = 'N810 mozilla-1.9.2 talos Tsvg'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tsvg']['build_dir'] = 'n810-1.9.2-tsvg'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tsvg']['config_file'] = 'mobile.config'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tsvg']['timeout'] = 60
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tsspider']['suite_name'] = 'N810 mozilla-1.9.2 talos Tsspider'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tsspider']['build_dir'] = 'n810-1.9.2-tsspider'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tsspider']['config_file'] = 'mobile.config'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tsspider']['timeout'] = 60
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tgfx']['suite_name'] = 'N810 mozilla-1.9.2 talos Tgfx'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tgfx']['build_dir'] = 'n810-1.9.2-tgfx'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tgfx']['config_file'] = 'mobile.config'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tgfx']['timeout'] = 60
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['test_suites'] = {
-    'reftest':    {},
-    'crashtest':  {},
-    'xpcshell':   {},
-}
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['test_suites']['reftest']['knownFailCount'] = 310
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['test_suites']['crashtest']['knownFailCount'] = 4
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['test_suites']['xpcshell']['knownFailCount'] = 182
-
-#
-# {{{1 TraceMonkey
-#
-BRANCHES['tracemonkey']['tinderbox_tree'] = "MozillaTest"
-BRANCHES['tracemonkey']['graph_server'] = "graphs-stage.mozilla.org"
-BRANCHES['tracemonkey']['platforms'] = {
-    'n810': {},
-}
-BRANCHES['tracemonkey']['platforms']['n810']['base_name'] = 'Maemo tracemonkey'
-BRANCHES['tracemonkey']['platforms']['n810']['slaves'] = SLAVES['n810']
-BRANCHES['tracemonkey']['platforms']['n810']['buildbot_branch'] = 'maemo-tm'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_branch'] = 'mobile-tracemonkey'
-BRANCHES['tracemonkey']['platforms']['n810']['poll_interval'] = 5*60
-BRANCHES['tracemonkey']['platforms']['n810']['unit_build_dirs'] = [
-    'http://ftp.mozilla.org/pub/mozilla.org/mobile/nightly/latest-mobile-tracemonkey/',
-]
-BRANCHES['tracemonkey']['platforms']['n810']['talos_build_dirs'] = [
-    'http://ftp.mozilla.org/pub/mozilla.org/mobile/tinderbox-builds/mobile-tracemonkey/',
-    'http://ftp.mozilla.org/pub/mozilla.org/mobile/nightly/latest-mobile-tracemonkey/',
-]
-BRANCHES['tracemonkey']['platforms']['n810']['poller_string'] = 'fennec-.*\.en-US\.linux.*arm\.tar\.bz2'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_scripts'] = 'http://staging-mobile-master.build.mozilla.org/maemo/talos.tar.bz2'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_pageloader'] = 'http://staging-mobile-master.build.mozilla.org/maemo/pageloader.tar.bz2'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites'] = {
-    'tp4': {},
-    'tp4_nochrome': {},
-    'tpan': {},
-    'tzoom': {},
-    'ts': {},
-    'twinopen': {},
-    'tdhtml': {},
-    'tsvg': {},
-    'tsspider': {},
-    'tgfx': {},
-}
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tp4']['suite_name'] = 'N810 tracemonkey talos Tp4'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tp4']['build_dir'] = 'n810-tm-tp4'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tp4']['config_file'] = 'mobile.config'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tp4']['timeout'] = 90
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tp4_nochrome']['suite_name'] = 'N810 tracemonkey talos Tp4 nochrome'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tp4_nochrome']['build_dir'] = 'n810-tm-tp4-nochrome'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tp4_nochrome']['config_file'] = 'mobile.config'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tp4_nochrome']['timeout'] = 90
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tpan']['suite_name'] = 'N810 tracemonkey talos Tpan'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tpan']['build_dir'] = 'n810-tm-tpan'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tpan']['config_file'] = 'mobile.config'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tpan']['timeout'] = 90
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tzoom']['suite_name'] = 'N810 tracemonkey talos Tzoom'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tzoom']['build_dir'] = 'n810-tm-tzoom'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tzoom']['config_file'] = 'mobile.config'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tzoom']['timeout'] = 90
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['ts']['suite_name'] = 'N810 tracemonkey talos Ts'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['ts']['build_dir'] = 'n810-tm-ts'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['ts']['config_file'] = 'mobile.config'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['ts']['timeout'] = 60
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['twinopen']['suite_name'] = 'N810 tracemonkey talos Twinopen'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['twinopen']['build_dir'] = 'n810-tm-twinopen'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['twinopen']['config_file'] = 'mobile.config'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['twinopen']['timeout'] = 60
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tdhtml']['suite_name'] = 'N810 tracemonkey talos Tdhtml'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tdhtml']['build_dir'] = 'n810-tm-tdhtml'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tdhtml']['config_file'] = 'mobile.config'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tdhtml']['timeout'] = 60
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tsvg']['suite_name'] = 'N810 tracemonkey talos Tsvg'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tsvg']['build_dir'] = 'n810-tm-tsvg'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tsvg']['config_file'] = 'mobile.config'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tsvg']['timeout'] = 60
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tsspider']['suite_name'] = 'N810 tracemonkey talos Tsspider'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tsspider']['build_dir'] = 'n810-tm-tsspider'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tsspider']['config_file'] = 'mobile.config'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tsspider']['timeout'] = 60
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tgfx']['suite_name'] = 'N810 tracemonkey talos Tgfx'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tgfx']['build_dir'] = 'n810-tm-tgfx'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tgfx']['config_file'] = 'mobile.config'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tgfx']['timeout'] = 60
-BRANCHES['tracemonkey']['platforms']['n810']['test_suites'] = {
-    'reftest':    {},
-    'crashtest':  {},
-    'xpcshell':   {},
-}
-BRANCHES['tracemonkey']['platforms']['n810']['test_suites']['reftest']['knownFailCount'] = 310
-BRANCHES['tracemonkey']['platforms']['n810']['test_suites']['crashtest']['knownFailCount'] = 4
-BRANCHES['tracemonkey']['platforms']['n810']['test_suites']['xpcshell']['knownFailCount'] = 182
deleted file mode 100644
--- a/mobile-staging/master.cfg
+++ /dev/null
@@ -1,160 +0,0 @@
-###########################################################################
-# mobile-staging master.cfg
-###########################################################################
-
-from buildbot.buildslave import BuildSlave
-from buildbot.changes.pb import PBChangeSource
-from buildbot.scheduler import Scheduler, Periodic
-from buildbot.status import html, tinderbox
-from buildbot.status.mail import MailNotifier
-
-import buildbotcustom.process.mobiletestfactory
-reload(buildbotcustom.process.mobiletestfactory)
-from buildbotcustom.process.mobiletestfactory import MaemoUnittestFactory, \
-  MobileParseTestLog, MaemoTalosFactory, RebootFactory
-
-import buildbotcustom.changes.mobileftppoller
-reload(buildbotcustom.changes.mobileftppoller)
-from buildbotcustom.changes.mobileftppoller import MobileFtpPoller
-
-import config
-reload(config)
-from config import BRANCHES, SLAVES
-
-c = BuildmasterConfig = {}
-adminEmails = ['aki@mozilla.com', 'jford@mozilla.com']
-
-c['debugPassword'] = "mozilla"
-c['projectName'] = "staging-mobile-master"
-c['projectURL'] = "http://staging-mobile-master.build.mozilla.org:8010/"
-c['buildbotURL'] = "http://staging-mobile-master.build.mozilla.org:8010/"
-c['slavePortnum'] = 9010
-
-c['change_source'] = []
-c['change_source'].append(PBChangeSource())
-
-c['slaves'] = []
-for platform, names in SLAVES.items():
-    for name in names:
-        c['slaves'].append(BuildSlave(name, 'm0b1l3', max_builds=1))
-
-c['status'] = []
-c['status'].append(html.WebStatus(http_port=8010, allowForce=True))
-
-c['status'].append(MailNotifier(
-    fromaddr="cltbld@staging-mobile-master.build.mozilla.org",
-    sendToInterestedUsers=False,
-    extraRecipients=adminEmails,
-    mode="failing",
-    builders=None,
-    relayhost="smtp.mozilla.org"
-))
-
-c['schedulers'] = []
-c['builders'] = []
-
-for branchName in sorted(BRANCHES.keys()):
-    branch=BRANCHES[branchName]
-    unittestBuilders = []
-    talosBuilders = []
-
-    for platformName in sorted(branch['platforms'].keys()):
-        platform = branch['platforms'][platformName]
-        baseName = platform['base_name']
-
-        c['change_source'].append(MobileFtpPoller(
-            tree=branchName,
-            branch='%s-unit' % platform['buildbot_branch'],
-            pollInterval=platform['poll_interval'],
-            ftpURLs=platform['unit_build_dirs'],
-            searchString=platform['poller_string'],
-        ))
-        c['change_source'].append(MobileFtpPoller(
-            tree=branchName,
-            branch='%s-talos' % platform['buildbot_branch'],
-            pollInterval=platform['poll_interval'],
-            ftpURLs=platform['talos_build_dirs'],
-            idleTimeout=2*60*60,
-            searchString=platform['poller_string'],
-        ))
-
-        # Talos suites
-        for talosSuiteName in sorted(platform['talos_suites'].keys()):
-            resultsServer = branch['graph_server']
-            talosSuite = platform['talos_suites'][talosSuiteName]
-            nochrome = False
-            if 'nochrome' in talosSuiteName:
-                nochrome = True
-                talosSuiteName = talosSuiteName.replace('_nochrome','')
-            activeTests = { talosSuiteName: talosSuite['timeout'] }
-            if 'graph_server' in talosSuite:
-                resultsServer = talosSuite['graph_server']
-            talosFactory = MaemoTalosFactory(
-                activeTests=activeTests,
-                talosConfigFile=talosSuite['config_file'],
-                resultsServer=resultsServer,
-                branch=platform['talos_branch'],
-                talosTarball=platform['talos_scripts'],
-                pageloaderTarball=platform['talos_pageloader'],
-                reboot=True,
-                hackTbPrint=0,
-                nochrome=nochrome
-            )
-            talosBuilder = {
-                'name': talosSuite['suite_name'],
-                'slavenames': platform['slaves'],
-                'builddir': talosSuite['build_dir'],
-                'factory': talosFactory,
-                'category': platform['buildbot_branch'],
-            }
-            c['builders'].append(talosBuilder)
-            talosBuilders.append(talosSuite['suite_name'])
-
-        # Unit test suites
-        for testName in sorted(platform['test_suites'].keys()):
-            builderName = "%s %s" % (platform['base_name'], testName)
-            testSuite = platform['test_suites'][testName]
-            testFactory = MaemoUnittestFactory(
-                activeTests={testName: testSuite},
-                reboot=True
-            )
-            testBuilder = {
-                'name': builderName,
-                'slavenames': platform['slaves'],
-                'builddir': "%s-%s" % (platform['buildbot_branch'], testName),
-                'factory': testFactory,
-                'category': platform['buildbot_branch'],
-            }
-            c['builders'].append(testBuilder)
-            unittestBuilders.append(builderName)
-
-    c['schedulers'].append(Scheduler(
-        name="%s talos scheduler" % branchName,
-        branch='%s-talos' % platform['buildbot_branch'],
-        treeStableTimer=5*60,
-        builderNames=talosBuilders,
-    ))
-    c['schedulers'].append(Scheduler(
-        name="%s unit scheduler" % branchName,
-        branch='%s-unit' % platform['buildbot_branch'],
-        treeStableTimer=5*60,
-        builderNames=unittestBuilders,
-    ))
-
-    c['status'].append(tinderbox.TinderboxMailNotifier(
-        fromaddr="mobile.buildbot@build.mozilla.org",
-        tree=branch['tinderbox_tree'],
-        extraRecipients=["tinderbox-daemon@tinderbox.mozilla.org"],
-        relayhost="smtp.mozilla.org",
-        builders=talosBuilders,
-        logCompression="bzip2"
-    ))
-    c['status'].append(tinderbox.TinderboxMailNotifier(
-        fromaddr="mobile.buildbot@build.mozilla.org",
-        tree=branch['tinderbox_tree'],
-        extraRecipients=["tinderbox-daemon@tinderbox.mozilla.org"],
-        relayhost="smtp.mozilla.org",
-        builders=unittestBuilders,
-        logCompression="bzip2",
-        errorparser="unittest"
-    ))
rename from mobile-rw/config-production.py
rename to mobile/config-production.py
rename from mobile-rw/config-staging.py
rename to mobile/config-staging.py
deleted file mode 100644
--- a/mobile/config.py
+++ /dev/null
@@ -1,263 +0,0 @@
-SLAVES = {
-    'n810': ['maemo-n810-%02i' % x for x in [1,3,4,5,6] + range(9,81)],
-}
-
-BRANCHES = {
-    'mozilla-central': {},
-    'mozilla-1.9.2': {},
-    'tracemonkey'  : {},
-}
-
-#
-# {{{1 mozilla-central
-#
-BRANCHES['mozilla-central']['tinderbox_tree'] = "Mobile"
-BRANCHES['mozilla-central']['graph_server'] = "graphs.mozilla.org"
-BRANCHES['mozilla-central']['platforms'] = {
-    'n810': {},
-}
-BRANCHES['mozilla-central']['platforms']['n810']['base_name'] = 'Maemo mozilla-central'
-BRANCHES['mozilla-central']['platforms']['n810']['slaves'] = SLAVES['n810']
-BRANCHES['mozilla-central']['platforms']['n810']['buildbot_branch'] = 'maemo-trunk'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_branch'] = 'mobile'
-BRANCHES['mozilla-central']['platforms']['n810']['poll_interval'] = 5*60
-BRANCHES['mozilla-central']['platforms']['n810']['unit_build_dirs'] = [
-    'http://ftp.mozilla.org/pub/mozilla.org/mobile/tinderbox-builds/mobile-trunk/',
-    'http://ftp.mozilla.org/pub/mozilla.org/mobile/nightly/latest-mobile-trunk/',
-]
-BRANCHES['mozilla-central']['platforms']['n810']['talos_build_dirs'] = [
-    'http://ftp.mozilla.org/pub/mozilla.org/mobile/tinderbox-builds/mobile-trunk/',
-    'http://ftp.mozilla.org/pub/mozilla.org/mobile/nightly/latest-mobile-trunk/',
-]
-BRANCHES['mozilla-central']['platforms']['n810']['poller_string'] = 'fennec-.*\.en-US\.linux.*arm\.tar\.bz2'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_scripts'] = 'http://production-mobile-master.build.mozilla.org/maemo/talos.tar.bz2'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_pageloader'] = 'http://production-mobile-master.build.mozilla.org/maemo/pageloader.tar.bz2'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites'] = {
-    'tp4': {},
-    'tp4_nochrome': {},
-    'tpan': {},
-    'tzoom': {},
-    'ts': {},
-    'twinopen': {},
-    'tdhtml': {},
-    'tsvg': {},
-    'tsspider': {},
-    'tgfx': {},
-}
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tp4']['suite_name'] = 'N810 mozilla-central talos Tp4'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tp4']['build_dir'] = 'n810-trunk-tp4'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tp4']['config_file'] = 'mobile.config'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tp4']['timeout'] = 90
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tp4_nochrome']['suite_name'] = 'N810 mozilla-central talos Tp4 nochrome'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tp4_nochrome']['build_dir'] = 'n810-trunk-tp4-nochrome'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tp4_nochrome']['config_file'] = 'mobile.config'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tp4_nochrome']['timeout'] = 90
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tpan']['suite_name'] = 'N810 mozilla-central talos Tpan'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tpan']['build_dir'] = 'n810-trunk-tpan'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tpan']['config_file'] = 'mobile.config'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tpan']['timeout'] = 60
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tzoom']['suite_name'] = 'N810 mozilla-central talos Tzoom'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tzoom']['build_dir'] = 'n810-trunk-tzoom'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tzoom']['config_file'] = 'mobile.config'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tzoom']['timeout'] = 60
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['ts']['suite_name'] = 'N810 mozilla-central talos Ts'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['ts']['build_dir'] = 'n810-trunk-ts'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['ts']['config_file'] = 'mobile.config'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['ts']['timeout'] = 60
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['twinopen']['suite_name'] = 'N810 mozilla-central talos Twinopen'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['twinopen']['build_dir'] = 'n810-trunk-twinopen'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['twinopen']['config_file'] = 'mobile.config'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['twinopen']['timeout'] = 60
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tdhtml']['suite_name'] = 'N810 mozilla-central talos Tdhtml'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tdhtml']['build_dir'] = 'n810-trunk-tdhtml'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tdhtml']['config_file'] = 'mobile.config'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tdhtml']['timeout'] = 60
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tsvg']['suite_name'] = 'N810 mozilla-central talos Tsvg'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tsvg']['build_dir'] = 'n810-trunk-tsvg'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tsvg']['config_file'] = 'mobile.config'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tsvg']['timeout'] = 60
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tsspider']['suite_name'] = 'N810 mozilla-central talos Tsspider'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tsspider']['build_dir'] = 'n810-trunk-tsspider'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tsspider']['config_file'] = 'mobile.config'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tsspider']['timeout'] = 60
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tgfx']['suite_name'] = 'N810 mozilla-central talos Tgfx'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tgfx']['build_dir'] = 'n810-trunk-tgfx'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tgfx']['config_file'] = 'mobile.config'
-BRANCHES['mozilla-central']['platforms']['n810']['talos_suites']['tgfx']['timeout'] = 60
-BRANCHES['mozilla-central']['platforms']['n810']['test_suites'] = {
-    'reftest':    {},
-    'crashtest':  {},
-    'xpcshell':   {},
-}
-BRANCHES['mozilla-central']['platforms']['n810']['test_suites']['reftest']['knownFailCount'] = 310
-BRANCHES['mozilla-central']['platforms']['n810']['test_suites']['crashtest']['knownFailCount'] = 4
-BRANCHES['mozilla-central']['platforms']['n810']['test_suites']['xpcshell']['knownFailCount'] = 182
-
-#
-# {{{1 mozilla-1.9.2
-#
-BRANCHES['mozilla-1.9.2']['tinderbox_tree'] = "Mobile1.1"
-BRANCHES['mozilla-1.9.2']['graph_server'] = "graphs.mozilla.org"
-BRANCHES['mozilla-1.9.2']['platforms'] = {
-    'n810': {},
-}
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['base_name'] = 'Maemo mozilla-1.9.2'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['slaves'] = SLAVES['n810']
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['buildbot_branch'] = 'maemo-1.9.2'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_branch'] = 'mobile-1.9.2'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['poll_interval'] = 5*60
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['unit_build_dirs'] = [
-    'http://ftp.mozilla.org/pub/mozilla.org/mobile/tinderbox-builds/mobile-1.9.2/',
-    'http://ftp.mozilla.org/pub/mozilla.org/mobile/nightly/latest-mobile-1.9.2/',
-]
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_build_dirs'] = [
-    'http://ftp.mozilla.org/pub/mozilla.org/mobile/nightly/latest-mobile-1.9.2/',
-    'http://ftp.mozilla.org/pub/mozilla.org/mobile/tinderbox-builds/mobile-1.9.2/',
-]
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['poller_string'] = 'fennec-.*\.en-US\.linux.*arm\.tar\.bz2'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_scripts'] = 'http://production-mobile-master.build.mozilla.org/maemo/talos.tar.bz2'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_pageloader'] = 'http://production-mobile-master.build.mozilla.org/maemo/pageloader.tar.bz2'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites'] = {
-    'tp4': {},
-    'tp4_nochrome': {},
-    'tpan': {},
-    'tzoom': {},
-    'ts': {},
-    'twinopen': {},
-    'tdhtml': {},
-    'tsvg': {},
-    'tsspider': {},
-    'tgfx': {},
-}
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tp4']['suite_name'] = 'N810 mozilla-1.9.2 talos Tp4'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tp4']['build_dir'] = 'n810-1.9.2-tp4'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tp4']['config_file'] = 'mobile.config'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tp4']['timeout'] = 90
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tp4_nochrome']['suite_name'] = 'N810 mozilla-1.9.2 talos Tp4 nochrome'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tp4_nochrome']['build_dir'] = 'n810-1.9.2-tp4-nochrome'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tp4_nochrome']['config_file'] = 'mobile.config'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tp4_nochrome']['timeout'] = 90
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tpan']['suite_name'] = 'N810 mozilla-1.9.2 talos Tpan'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tpan']['build_dir'] = 'n810-1.9.2-tpan'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tpan']['config_file'] = 'mobile.config'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tpan']['timeout'] = 60
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tzoom']['suite_name'] = 'N810 mozilla-1.9.2 talos Tzoom'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tzoom']['build_dir'] = 'n810-1.9.2-tzoom'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tzoom']['config_file'] = 'mobile.config'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tzoom']['timeout'] = 60
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['ts']['suite_name'] = 'N810 mozilla-1.9.2 talos Ts'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['ts']['build_dir'] = 'n810-1.9.2-ts'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['ts']['config_file'] = 'mobile.config'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['ts']['timeout'] = 60
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['twinopen']['suite_name'] = 'N810 mozilla-1.9.2 talos Twinopen'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['twinopen']['build_dir'] = 'n810-1.9.2-twinopen'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['twinopen']['config_file'] = 'mobile.config'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['twinopen']['timeout'] = 60
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tdhtml']['suite_name'] = 'N810 mozilla-1.9.2 talos Tdhtml'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tdhtml']['build_dir'] = 'n810-1.9.2-tdhtml'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tdhtml']['config_file'] = 'mobile.config'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tdhtml']['timeout'] = 60
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tsvg']['suite_name'] = 'N810 mozilla-1.9.2 talos Tsvg'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tsvg']['build_dir'] = 'n810-1.9.2-tsvg'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tsvg']['config_file'] = 'mobile.config'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tsvg']['timeout'] = 60
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tsspider']['suite_name'] = 'N810 mozilla-1.9.2 talos Tsspider'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tsspider']['build_dir'] = 'n810-1.9.2-tsspider'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tsspider']['config_file'] = 'mobile.config'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tsspider']['timeout'] = 60
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tgfx']['suite_name'] = 'N810 mozilla-1.9.2 talos Tgfx'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tgfx']['build_dir'] = 'n810-1.9.2-tgfx'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tgfx']['config_file'] = 'mobile.config'
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['talos_suites']['tgfx']['timeout'] = 60
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['test_suites'] = {
-    'reftest':    {},
-    'crashtest':  {},
-    'xpcshell':   {},
-}
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['test_suites']['reftest']['knownFailCount'] = 310
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['test_suites']['crashtest']['knownFailCount'] = 4
-BRANCHES['mozilla-1.9.2']['platforms']['n810']['test_suites']['xpcshell']['knownFailCount'] = 182
-
-#
-# {{{1 TraceMonkey
-#
-BRANCHES['tracemonkey']['tinderbox_tree'] = "TraceMonkey"
-BRANCHES['tracemonkey']['graph_server'] = "graphs.mozilla.org"
-BRANCHES['tracemonkey']['platforms'] = {
-    'n810': {},
-}
-BRANCHES['tracemonkey']['platforms']['n810']['base_name'] = 'Maemo tracemonkey'
-BRANCHES['tracemonkey']['platforms']['n810']['slaves'] = SLAVES['n810']
-BRANCHES['tracemonkey']['platforms']['n810']['buildbot_branch'] = 'maemo-tm'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_branch'] = 'mobile-tracemonkey'
-BRANCHES['tracemonkey']['platforms']['n810']['poll_interval'] = 5*60
-BRANCHES['tracemonkey']['platforms']['n810']['unit_build_dirs'] = [
-    'http://ftp.mozilla.org/pub/mozilla.org/mobile/nightly/latest-mobile-tracemonkey/',
-]
-BRANCHES['tracemonkey']['platforms']['n810']['talos_build_dirs'] = [
-    'http://ftp.mozilla.org/pub/mozilla.org/mobile/tinderbox-builds/mobile-tracemonkey/',
-    'http://ftp.mozilla.org/pub/mozilla.org/mobile/nightly/latest-mobile-tracemonkey/',
-]
-BRANCHES['tracemonkey']['platforms']['n810']['poller_string'] = 'fennec-.*\.en-US\.linux.*arm\.tar\.bz2'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_scripts'] = 'http://production-mobile-master.build.mozilla.org/maemo/talos.tar.bz2'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_pageloader'] = 'http://production-mobile-master.build.mozilla.org/maemo/pageloader.tar.bz2'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites'] = {
-    'tp4': {},
-    'tp4_nochrome': {},
-    'tpan': {},
-    'tzoom': {},
-    'ts': {},
-    'twinopen': {},
-    'tdhtml': {},
-    'tsvg': {},
-    'tsspider': {},
-    'tgfx': {},
-}
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tp4']['suite_name'] = 'N810 tracemonkey talos Tp4'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tp4']['build_dir'] = 'n810-tm-tp4'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tp4']['config_file'] = 'mobile.config'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tp4']['timeout'] = 90
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tp4_nochrome']['suite_name'] = 'N810 tracemonkey talos Tp4 nochrome'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tp4_nochrome']['build_dir'] = 'n810-tm-tp4-nochrome'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tp4_nochrome']['config_file'] = 'mobile.config'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tp4_nochrome']['timeout'] = 90
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tpan']['suite_name'] = 'N810 tracemonkey talos Tpan'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tpan']['build_dir'] = 'n810-tm-tpan'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tpan']['config_file'] = 'mobile.config'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tpan']['timeout'] = 60
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tzoom']['suite_name'] = 'N810 tracemonkey talos Tzoom'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tzoom']['build_dir'] = 'n810-tm-tzoom'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tzoom']['config_file'] = 'mobile.config'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tzoom']['timeout'] = 60
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['ts']['suite_name'] = 'N810 tracemonkey talos Ts'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['ts']['build_dir'] = 'n810-tm-ts'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['ts']['config_file'] = 'mobile.config'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['ts']['timeout'] = 60
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['twinopen']['suite_name'] = 'N810 tracemonkey talos Twinopen'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['twinopen']['build_dir'] = 'n810-tm-twinopen'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['twinopen']['config_file'] = 'mobile.config'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['twinopen']['timeout'] = 60
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tdhtml']['suite_name'] = 'N810 tracemonkey talos Tdhtml'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tdhtml']['build_dir'] = 'n810-tm-tdhtml'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tdhtml']['config_file'] = 'mobile.config'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tdhtml']['timeout'] = 60
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tsvg']['suite_name'] = 'N810 tracemonkey talos Tsvg'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tsvg']['build_dir'] = 'n810-tm-tsvg'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tsvg']['config_file'] = 'mobile.config'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tsvg']['timeout'] = 60
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tsspider']['suite_name'] = 'N810 tracemonkey talos Tsspider'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tsspider']['build_dir'] = 'n810-tm-tsspider'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tsspider']['config_file'] = 'mobile.config'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tsspider']['timeout'] = 60
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tgfx']['suite_name'] = 'N810 tracemonkey talos Tgfx'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tgfx']['build_dir'] = 'n810-tm-tgfx'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tgfx']['config_file'] = 'mobile.config'
-BRANCHES['tracemonkey']['platforms']['n810']['talos_suites']['tgfx']['timeout'] = 60
-BRANCHES['tracemonkey']['platforms']['n810']['test_suites'] = {
-    'reftest':    {},
-    'crashtest':  {},
-    'xpcshell':   {},
-}
-BRANCHES['tracemonkey']['platforms']['n810']['test_suites']['reftest']['knownFailCount'] = 310
-BRANCHES['tracemonkey']['platforms']['n810']['test_suites']['crashtest']['knownFailCount'] = 4
-BRANCHES['tracemonkey']['platforms']['n810']['test_suites']['xpcshell']['knownFailCount'] = 182
rename from mobile-rw/defaults.py
rename to mobile/defaults.py
--- a/mobile/master.cfg
+++ b/mobile/master.cfg
@@ -1,159 +1,174 @@
-###########################################################################
-# mobile-production master.cfg
-###########################################################################
-
 from buildbot.buildslave import BuildSlave
 from buildbot.changes.pb import PBChangeSource
 from buildbot.scheduler import Scheduler, Periodic
 from buildbot.status import html, tinderbox
 from buildbot.status.mail import MailNotifier
 
 import buildbotcustom.process.mobiletestfactory
 reload(buildbotcustom.process.mobiletestfactory)
-from buildbotcustom.process.mobiletestfactory import MaemoUnittestFactory, \
-MobileParseTestLog, MaemoTalosFactory, RebootFactory
+from buildbotcustom.process.mobiletestfactory import MobileUnittestFactory, \
+ MobileTalosFactory
 
 import buildbotcustom.changes.mobileftppoller
 reload(buildbotcustom.changes.mobileftppoller)
 from buildbotcustom.changes.mobileftppoller import MobileFtpPoller
 
 import config
 reload(config)
-from config import BRANCHES, SLAVES
+from config import MASTER, BRANCHES, SLAVES
 
 c = BuildmasterConfig = {}
-adminEmails = ['aki@mozilla.com', 'jford@mozilla.com']
-
 c['debugPassword'] = "mozilla"
-c['projectName'] = "production-mobile-master"
-c['projectURL'] = "http://production-mobile-master.build.mozilla.org:8010/"
-c['buildbotURL'] = "http://production-mobile-master.build.mozilla.org:8010/"
-c['slavePortnum'] = 9010
+c['projectName'] = MASTER['name']
+c['projectURL'] = "http://%s.build.mozilla.org:%d/" % (MASTER['name'], MASTER['http_port'])
+c['buildbotURL'] = "http://%s.build.mozilla.org:%d/" % (MASTER['name'], MASTER['http_port'])
+c['slavePortnum'] = MASTER['slave_port']
 
 c['change_source'] = []
 c['change_source'].append(PBChangeSource())
 
 c['slaves'] = []
 for platform, names in SLAVES.items():
     for name in names:
         c['slaves'].append(BuildSlave(name, 'm0b1l3', max_builds=1))
 
 c['status'] = []
-c['status'].append(html.WebStatus(http_port=8010, allowForce=True))
+c['status'].append(html.WebStatus(http_port=MASTER['http_port'], allowForce=True))
 
 c['status'].append(MailNotifier(
-    fromaddr="cltbld@production-mobile-master.build.mozilla.org",
+    fromaddr="cltbld@%s.build.mozilla.org" % MASTER['name'],
     sendToInterestedUsers=False,
-    extraRecipients=adminEmails,
+    extraRecipients=MASTER['admin_emails'],
     mode="failing",
     builders=None,
     relayhost="smtp.mozilla.org"
 ))
 
 c['schedulers'] = []
 c['builders'] = []
 
-for branchName in sorted(BRANCHES.keys()):
-    branch=BRANCHES[branchName]
-    unittestBuilders = []
-    talosBuilders = []
+for branch_name in sorted(BRANCHES.keys()):
+    branch=BRANCHES[branch_name]
+    branch_builders=[]
 
-    for platformName in sorted(branch['platforms'].keys()):
-        platform = branch['platforms'][platformName]
-        baseName = platform['base_name']
+    for platform_name in sorted(branch['platforms'].keys()):
+        unittest_builders = []
+        talos_builders = []
+        bb_branch= "%s-%s" % (branch_name, platform_name)
+        platform = branch['platforms'][platform_name]
 
         c['change_source'].append(MobileFtpPoller(
-            tree=branchName,
-            branch='%s-talos' % platform['buildbot_branch'],
+            tree=branch_name,
+            branch='%s-talos' % bb_branch,
             pollInterval=platform['poll_interval'],
             ftpURLs=platform['talos_build_dirs'],
-            idleTimeout=60*60,
+            idleTimeout=2*60*60,
             searchString=platform['poller_string'],
         ))
         c['change_source'].append(MobileFtpPoller(
-            tree=branchName,
-            branch='%s-unit' % platform['buildbot_branch'],
+            tree=branch_name,
+            branch='%s-unit' % bb_branch,
             pollInterval=platform['poll_interval'],
             ftpURLs=platform['unit_build_dirs'],
             searchString=platform['poller_string'],
         ))
+        # Talos suites
+        for suite_name in sorted(platform['talos_suites'].keys()):
+            suite = platform['talos_suites'][suite_name]
+            if 'nochrome' in suite_name:
+                nochrome = True
+                short_name = suite_name.replace('_nochrome','')
+                #the replace is because we supply nochrome as a command
+                #line argument to the tp4 test instead of having a seperate
+                #tp4_nochrome test
+            else:
+                short_name = suite_name
+                nochrome = False
 
-        # Talos suites
-        for talosSuiteName in sorted(platform['talos_suites'].keys()):
-            resultsServer = branch['graph_server']
-            talosSuite = platform['talos_suites'][talosSuiteName]
-            if 'graph_server' in talosSuite:
-                resultsServer = talosSuite['graph_server']
-            nochrome = False
-            if 'nochrome' in talosSuiteName:
-                nochrome = True
-                talosSuiteName = talosSuiteName.replace('_nochrome','')
-            activeTests = { talosSuiteName: talosSuite['timeout'] }
-            talosFactory = MaemoTalosFactory(
-                activeTests=activeTests,
-                talosConfigFile=talosSuite['config_file'],
-                resultsServer=resultsServer,
+            talos_factory = MobileTalosFactory(
+                test=short_name,
+                timeout=suite['timeout'],
+                browser_wait=platform['browser_wait'],
+                talos_config_file=suite['config_file'],
+                results_server=branch['graph_server'],
                 branch=platform['talos_branch'],
-                talosTarball=platform['talos_scripts'],
-                pageloaderTarball=platform['talos_pageloader'],
-                reboot=True,
-                hackTbPrint=1,
-                nochrome=nochrome,
-            )
-            talosBuilder = {
-                'name': talosSuite['suite_name'],
-                'slavenames': platform['slaves'],
-                'builddir': talosSuite['build_dir'],
-                'factory': talosFactory,
-                'category': platform['buildbot_branch'],
-            }
-            c['builders'].append(talosBuilder)
-            talosBuilders.append(talosSuite['suite_name'])
-
-        # Unit test suites
-        for testName in sorted(platform['test_suites'].keys()):
-            builderName = "%s %s" % (platform['base_name'], testName)
-            testSuite = platform['test_suites'][testName]
-            testFactory = MaemoUnittestFactory(
-                activeTests={testName: testSuite},
+                talos_tarball=platform.get('talos_tarball'),
+                pageloader_tarball=platform.get('pageloader_tarball'),
+                reboot=platform['reboot'],
+                reboot_cmd=platform['reboot_cmd'],
+                nochrome=nochrome
             )
-            testBuilder = {
-                'name': builderName,
+            builder_name = "%s %s talos %s" % (platform_name, branch_name,
+                                               suite_name)
+            talos_builder = {
+                'name': builder_name,
                 'slavenames': platform['slaves'],
-                'builddir': "%s-%s" % (platform['buildbot_branch'], testName),
-                'factory': testFactory,
-                'category': platform['buildbot_branch'],
+                'builddir': "%s-%s-%s" % (platform_name, branch_name, suite_name),
+                'slavebuilddir': '/builds/slave_build_dir',
+                'factory': talos_factory,
+                'category': bb_branch,
             }
-            c['builders'].append(testBuilder)
-            unittestBuilders.append(builderName)
+            c['builders'].append(talos_builder)
+            talos_builders.append(builder_name)
+            branch_builders.append(builder_name)
+        # Unit test suites
+        for test_name in sorted(platform['test_suites'].keys()):
+            test = platform['test_suites'][test_name]
+            test_factory = MobileUnittestFactory(
+                test=test_name,
+                timeout=test['timeout'],
+                test_type=test['test_type'],
+                known_fail_count=test['known_fail_count'],
+                clients=test.get('clients'),
+                maemkit_tarball=platform.get('maemkit_tarball'),
+                reboot=platform['reboot'],
+                reboot_cmd=platform['reboot_cmd'],
+            )
+            test_builder = {
+                'name': "%s %s unit %s" % (platform_name, branch_name, test_name),
+                'slavenames': platform['slaves'],
+                'builddir': "%s-%s-%s" % (platform_name, branch_name, test_name),
+                'factory': test_factory,
+                'category': bb_branch,
+            }
+            c['builders'].append(test_builder)
+            unittest_builders.append(test_builder['name'])
+            branch_builders.append(test_builder['name'])
 
-    c['schedulers'].append(Scheduler(
-        name="%s unit scheduler" % branchName,
-        branch='%s-unit' % platform['buildbot_branch'],
-        treeStableTimer=10*60,
-        builderNames=unittestBuilders,
-    ))
-    c['schedulers'].append(Scheduler(
-        name="%s talos scheduler" % branchName,
-        branch='%s-talos' % platform['buildbot_branch'],
-        treeStableTimer=10*60,
-        builderNames=talosBuilders,
-    ))
+        c['schedulers'].append(Scheduler(
+            name="%s %s talos scheduler" % (platform_name, branch_name),
+            branch='%s-talos' % bb_branch,
+            treeStableTimer=branch['tree_stable_timer'],
+            builderNames=talos_builders,
+        ))
+        c['schedulers'].append(Scheduler(
+            name="%s %s unit scheduler" % (platform_name, branch_name),
+            branch='%s-unit' % bb_branch,
+            treeStableTimer=branch['tree_stable_timer'],
+            builderNames=unittest_builders,
+        ))
+        c['schedulers'].append(Scheduler(
+            name="%s %s scheduler" % (platform_name, branch_name),
+            branch='%s' % bb_branch,
+            treeStableTimer=branch['tree_stable_timer'],
+            builderNames=unittest_builders+talos_builders,
+        ))
 
-    c['status'].append(tinderbox.TinderboxMailNotifier(
-        fromaddr="mobile.buildbot@build.mozilla.org",
-        tree=branch['tinderbox_tree'],
-        extraRecipients=["tinderbox-daemon@tinderbox.mozilla.org"],
-        relayhost="smtp.mozilla.org",
-        builders=talosBuilders,
-        logCompression="bzip2"
-    ))
-    c['status'].append(tinderbox.TinderboxMailNotifier(
-        fromaddr="mobile.buildbot@build.mozilla.org",
-        tree=branch['tinderbox_tree'],
-        extraRecipients=["tinderbox-daemon@tinderbox.mozilla.org"],
-        relayhost="smtp.mozilla.org",
-        builders=unittestBuilders,
-        logCompression="bzip2",
-        errorparser="unittest"
-    ))
+        c['status'].append(tinderbox.TinderboxMailNotifier(
+            fromaddr="mobile.buildbot@build.mozilla.org",
+            tree=branch['tinderbox_tree'],
+            extraRecipients=["tinderbox-daemon@tinderbox.mozilla.org"],
+            relayhost="smtp.mozilla.org",
+            builders=talos_builders,
+            logCompression="bzip2"
+        ))
+        c['status'].append(tinderbox.TinderboxMailNotifier(
+            fromaddr="mobile.buildbot@build.mozilla.org",
+            tree=branch['tinderbox_tree'],
+            extraRecipients=["tinderbox-daemon@tinderbox.mozilla.org"],
+            relayhost="smtp.mozilla.org",
+            builders=unittest_builders,
+            logCompression="bzip2",
+            errorparser="unittest"
+        ))
+