bug 605639 - use the standard buildbot branch on geriatric r=bear p=jhford
authorJohn Ford <jhford@mozilla.com>
Tue, 19 Oct 2010 16:12:16 -0700
changeset 3154 74424ac6d6e0cb5ab31083c47386275cb6ee927e
parent 3153 52521b7625562b5b6d3ffa113e62c85bacdc0b93
child 3155 37bac4ee2fef2aac718f6599abdb2783e149f902
push id1
push userroot
push dateWed, 17 Dec 2014 00:18:48 +0000
reviewersbear
bugs605639
bug 605639 - use the standard buildbot branch on geriatric r=bear p=jhford
geriatric/config.py
geriatric/master.cfg
mozilla/config.py
mozilla/production_config.py
mozilla/staging_config.py
--- 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(
--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -46,17 +46,16 @@ GLOBAL_VARS = {
         ('mochitests', dict(suite='mochitest-plain', chunkByDir=4, totalChunks=5)),
         ('mochitest-other', ['mochitest-chrome', 'mochitest-browser-chrome',
             'mochitest-a11y', 'mochitest-ipcplugins']),
         ('reftest', ['reftest']),
         ('crashtest', ['crashtest']),
         ('xpcshell', ['xpcshell']),
         ('jsreftest', ['jsreftest']),
     ],
-    'geriatric_masters': [],
     'platforms': {
         'linux': {},
         'linux64': {},
         'win32': {},
         'macosx64': {},
         'linux-debug': {},
         'linux64-debug': {},
         'macosx-debug': {},
@@ -667,19 +666,16 @@ for branch in BRANCHES.keys():
 # HGURL + repo_path should be a valid repository
 BRANCHES['mozilla-central']['repo_path'] = 'mozilla-central'
 BRANCHES['mozilla-central']['l10n_repo_path'] = 'l10n-central'
 BRANCHES['mozilla-central']['start_hour'] = [3]
 BRANCHES['mozilla-central']['start_minute'] = [2]
 # Enable XULRunner / SDK builds
 BRANCHES['mozilla-central']['enable_xulrunner'] = True
 # Enable unit tests
-BRANCHES['mozilla-central']['geriatric_masters'] = [
-    ('10.250.48.137:9989', False),
-]
 BRANCHES['mozilla-central']['enable_mac_a11y'] = True
 BRANCHES['mozilla-central']['unittest_build_space'] = 6
 # And code coverage
 BRANCHES['mozilla-central']['enable_codecoverage'] = True
 # L10n configuration
 BRANCHES['mozilla-central']['enable_l10n'] = True
 BRANCHES['mozilla-central']['enable_l10n_onchange'] = True
 BRANCHES['mozilla-central']['l10nNightlyUpdate'] = True
@@ -743,19 +739,16 @@ BRANCHES['shadow-central']['platforms'][
 ######## mozilla-2.0
 BRANCHES['mozilla-2.0']['repo_path'] = 'releases/mozilla-2.0'
 BRANCHES['mozilla-2.0']['l10n_repo_path'] = 'l10n-central'
 BRANCHES['mozilla-2.0']['start_hour'] = [3]
 BRANCHES['mozilla-2.0']['start_minute'] = [2]
 # Enable XULRunner / SDK builds
 BRANCHES['mozilla-2.0']['enable_xulrunner'] = True
 # Enable unit tests
-BRANCHES['mozilla-2.0']['geriatric_masters'] = [
-    ('10.250.48.137:9989', False),
-]
 BRANCHES['mozilla-2.0']['enable_mac_a11y'] = True
 BRANCHES['mozilla-2.0']['unittest_build_space'] = 6
 # And code coverage
 BRANCHES['mozilla-2.0']['enable_codecoverage'] = False
 # L10n configuration
 BRANCHES['mozilla-2.0']['enable_l10n'] = True
 BRANCHES['mozilla-2.0']['enable_l10n_onchange'] = True
 BRANCHES['mozilla-2.0']['l10nNightlyUpdate'] = True
--- a/mozilla/production_config.py
+++ b/mozilla/production_config.py
@@ -53,16 +53,17 @@ GLOBAL_VARS = {
         ('staging-master.build.mozilla.org:9009', False, 1),
         ('talos-staging-master02.build.mozilla.org:9012', False, 1),
     ],
     # List of unittest masters to notify of new builds to test,
     # if a failure to notify the master should result in a warning,
     # and sendchange retry count before give up
     'unittest_masters': [
         ('production-master01.build.mozilla.org:9009', True, 5),
+        ('geriatric-master.build.mozilla.org:9989', False, 5),
         ('staging-master.build.mozilla.org:9009', False, 1),
         ('talos-staging-master02.build.mozilla.org:9012', False, 1),
     ],
     'xulrunner_tinderbox_tree': 'XULRunner',
     'weekly_tinderbox_tree': 'Testing',
     'l10n_tinderbox_tree': 'Mozilla-l10n',
 }
 
--- a/mozilla/staging_config.py
+++ b/mozilla/staging_config.py
@@ -45,16 +45,18 @@ GLOBAL_VARS = {
         ('staging-master.build.mozilla.org:9009', True, 1),
         ('talos-staging-master02.build.mozilla.org:9012', True, 1),
     ],
     # List of unittest masters to notify of new builds to test,
     # if a failure to notify the master should result in a warning,
     # and sendchange retry count before give up
     'unittest_masters': [
         ('staging-master.build.mozilla.org:9009', True, 1),
+        #THIS SHOULD BE REMOVED FOR FINAL LANDING!
+        ('geriatric-master.build.mozilla.org:9989', False, 1),
         ('talos-staging-master02.build.mozilla.org:9012', True, 1),
         ],
     'xulrunner_tinderbox_tree': 'MozillaTest',
     'weekly_tinderbox_tree': 'MozillaTest',
     'l10n_tinderbox_tree': 'MozillaStaging',
     'packaged_unittest_tinderbox_tree': 'MozillaTest',
     'tinderbox_tree': 'MozillaTest',
     'mobile_tinderbox_tree': 'MobileTest',