bug 605639 - use the standard unit test branches for geriatric masters r=bear p=jhford
authorJohn Ford <jhford@mozilla.com>
Tue, 19 Oct 2010 16:16:35 -0700
changeset 3156 ad284d4364280457c43bf7b6cd6b92819e7085b1
parent 3155 37bac4ee2fef2aac718f6599abdb2783e149f902
child 3157 3e7d184cdc8dbfef751e50b1fdb72fc9d425ba82
push id1
push userroot
push dateWed, 17 Dec 2014 00:18:48 +0000
reviewersbear
bugs605639
bug 605639 - use the standard unit test branches for geriatric masters r=bear p=jhford
geriatric/config.py
geriatric/master.cfg
--- a/geriatric/config.py
+++ b/geriatric/config.py
@@ -5,16 +5,17 @@ slaves = {
     '10.5-g5': ['bm-xserve%02d' % x for x in range(1,6)],
 }
 
 all_tests = ('xpcshell', 'crashtest', 'reftest', 'mochitest-plain')
 
 branches = {
     'mozilla-1.9.2': {
         'tinderbox_tree': 'GeriatricMachines',
+        'repo_path': 'releases/mozilla-1.9.2',
         'platforms': {
             'linux': {
                 'variants': ['fedora12-p3'],
                 'tests': all_tests,
             },
             'win32': {
                 'variants': ['xp-p3'],
                 'tests': all_tests,
@@ -22,16 +23,17 @@ branches = {
             'macosx': {
                 'variants': ['10.5-g4', '10.5-g5'],
                 'tests': all_tests,
             },
         },
     },
     'mozilla-1.9.1': {
         'tinderbox_tree': 'GeriatricMachines',
+        'repo_path': 'releases/mozilla-1.9.1',
         'platforms': {
             'linux': {
                 'variants': ['fedora12-p3'],
                 'tests': all_tests,
             },
             'win32': {
                 'variants': ['xp-p3'],
                 'tests': all_tests,
@@ -39,29 +41,31 @@ branches = {
             'macosx': {
                 'variants': ['10.5-g4', '10.5-g5'],
                 'tests': all_tests,
             },
         },
     },
     'mozilla-2.0': {
         'tinderbox_tree': 'GeriatricMachines',
+        'repo_path': 'releases/mozilla-2.0',
         'platforms': {
             'linux': {
                 'variants': ['fedora12-p3'],
                 'tests': all_tests,
             },
             'win32': {
                 'variants': ['xp-p3'],
                 'tests': all_tests,
             },
         },
     },
     'mozilla-central': {
         'tinderbox_tree': 'GeriatricMachines',
+        'repo_path': 'releases/mozilla-1.9.2',
         'platforms': {
             'linux': {
                 'variants': ['fedora12-p3'],
                 'tests': all_tests,
             },
             'win32': {
                 'variants': ['xp-p3'],
                 'tests': all_tests,
--- a/geriatric/master.cfg
+++ b/geriatric/master.cfg
@@ -55,30 +55,33 @@ for branch in branches.keys():
             print 'Variant %s' % variant
             variant_slaves = slaves[variant]
             for suite in branches[branch]['platforms'][platform]['tests']:
                 builder_name = '%s-%s-%s %s' % (branch, platform, variant, suite)
                 factory = UnittestPackagedBuildFactory(
                             platform=platform,
                             test_suites=(suite,), #factory does for suite in self.test_suites
                             hgHost='hg.mozilla.org',
-                            repoPath=branch,
+                            repoPath=branches[branch]['repo_path'],
                             buildToolsRepoPath='build/tools',
                             buildSpace=1
                 )
                 builder = {
                     'name': builder_name,
                     'slavenames': variant_slaves,
                     'builddir': builder_name,
                     'factory': factory
                 }
                 builders.append(builder_name)
                 platform_builders.append(builder_name)
                 c['builders'].append(builder)
-        scheduler_branch = '%s-%s' % (branch, platform)
+        #We are assuming that only Opt builds are tested here.  By hardcoding the
+        #-opt-unittest, we don't need to continue having the special geriatric
+        #masters sendchange logic in the build master
+        scheduler_branch = '%s-%s-opt-unittest' % (branch, platform)
         scheduler = Scheduler(name=scheduler_branch, branch=scheduler_branch,
                             treeStableTimer=5, builderNames=platform_builders,
         )
         print 'Scheduler'
         print scheduler.branch
         c['schedulers'].append(scheduler)
 
     c['status'].append(TinderboxMailNotifier(