Bug 631597 - Prototype the "Canary" system for Thunderbird
authorJohn Hopkins <john.hopkins@mozillamessaging.com>
Fri, 09 Sep 2011 03:06:36 -0700
changeset 4729 18c44e6ae893c8c3e84526f7704dfbee3588ab76
parent 4728 d76ae177e5b957af90cb2788c31fcca93b063844
child 4730 c0885220ea472af855c796aa6a7a664a50cefa64
child 4733 0e53fde2b3dcdc779c3279385f2ac6abeef2bd3a
push id3727
push userjohn.hopkins@mozillamessaging.com
push dateFri, 09 Sep 2011 10:09:19 +0000
bugs631597
Bug 631597 - Prototype the "Canary" system for Thunderbird
thunderbird/config.py
--- a/thunderbird/config.py
+++ b/thunderbird/config.py
@@ -354,17 +354,17 @@ def makeBuildConfig(builderType=None, br
             bc['l10n'] = wantL10n
             bc['l10n_repo'] = l10nRepo
         bc['branch_name'] = branchName
         bc['allLocalesFile'] = \
             '%s/build/buildbot-configs/raw-file/default/thunderbird/l10n/%s' % (HGURL, allLocalesFile)
         # Blocklist settings
         bc['repo_path'] = bc['hg_branch'] # alias
         bc['product_name'] = 'thunderbird'
-        if branchName in ['comm-release']:
+        if branchName in ['comm-release', 'comm-central-tested']:
             bc['enable_blocklist_update'] = False
         else:
             bc['enable_blocklist_update'] = True
         if branchName in ['comm-central', 'comm-1.9.2']:
             bc['blocklist_update_on_closed_tree'] = True
         else:
             bc['blocklist_update_on_closed_tree'] = False
         bc['hg_ssh_key'] = '/home/cltbld/.ssh/tbirdbld_dsa'
@@ -372,31 +372,36 @@ def makeBuildConfig(builderType=None, br
         bc['hgurl'] = DEFAULTS['hgurl']
         bc['build_tools_repo_path'] = DEFAULTS['build_tools_repo']
         # end Blocklist settings
         bc['client_py_extra_args'] = \
             ['--skip-comm',
              '--hg-options=--verbose --time',
              '--skip-venkman',
              '--skip-chatzilla']
+        if 'comm-central-tested' in branchName:
+            bc['client_py_extra_args'] += ['--known-good']
         bc['codesighs'] = True
         bc['create_snippet'] = True
         bc['factory'] = 'CCNightlyBuildFactory'
-        bc['l10n_nightly_updates'] = True
+        if branchName in ['comm-central-tested']:
+            bc['l10n_nightly_updates'] = False
+        else:
+            bc['l10n_nightly_updates'] = True
         if branchName == 'comm-1.9.2':
             bc['l10n_tree'] = 'tb31x'
         else:
             bc['l10n_tree'] = 'tb'
         bc['milestone'] = branchName
         bc['mozconfig'] = 'nightly'
         bc['mozilla_central_branch'] = mozillaCentralBranch
         if branchName in ['comm-1.9.2']:
             bc['nightly_hour'] = [0]
         bc['package'] = True
-        if branchName not in ['comm-central', 'comm-1.9.2']:
+        if branchName not in ['comm-central', 'comm-central-tested', 'comm-1.9.2']:
             bc['period'] = 50400
         bc['upload_stage'] = True
         if branchName != 'comm-1.9.2':
             bc['packageTests'] = True
             bc['unittest_masters'] = [
                ('momo-vm-03.sj.mozillamessaging.com:9010',False,3),
               ]
         bc['platforms'] = {}
@@ -410,33 +415,35 @@ def makeBuildConfig(builderType=None, br
     elif builderType == 'bloat':
         bc['branch_name'] = branchName
         bc['builder_type'] = builderType
         bc['client_py_args'] = \
             ['--skip-comm',
              '--hg-options=--verbose --time',
              '--mozilla-repo=http://hg.mozilla.org/%s' % mozillaCentralBranch]
         bc['client_py_extra_args'] = ['--skip-venkman', '--skip-chatzilla']
+        if 'comm-central-tested' in branchName:
+            bc['client_py_extra_args'] += ['--known-good']
         bc['codesighs'] = False
         bc['create_snippet'] = False
         bc['factory'] = 'CCNightlyBuildFactory'
         bc['l10n'] = False
         bc['leak'] = True
         bc['mozconfig'] = 'debug'
         bc['mozilla_central_branch'] = mozillaCentralBranch
         bc['nightly'] = False
         bc['package'] = False
         if branchName == 'comm-1.9.2':
             pass
         else:
             bc['period'] = 50400
         bc['upload_stage'] = True
         bc['platforms'] = {}
         for platformName in ['linux', 'linux64', 'macosx', 'macosx64', 'win32']:
-            if platformName == 'macosx64' and bc['hg_branch'] != 'comm-central':
+            if platformName == 'macosx64' and bc['hg_branch'] not in ['comm-central', 'comm-central-tested']:
                 continue
             if platformName in ['linux64', 'macosx64'] and \
                branchName == 'comm-1.9.2':
                 continue
             bc['platforms'][platformName] = makePlatformConfig(bc, builderType, platformName, branchName)
         bc['upload_stage'] = False
     elif builderType == 'check':
         bc['branch_name'] = branchName
@@ -534,16 +541,34 @@ BRANCHES['comm-central'] = makeBuildConf
 BRANCHES['comm-central-bloat'] = makeBuildConfig(
                                builderType   = 'bloat',
                                branchName    = 'comm-central',
                                hgBranch      = 'comm-central',
                                mozillaCentralBranch = 'mozilla-central',
                                tinderboxTree = 'ThunderbirdTrunk'
                            )
 
+BRANCHES['comm-central-tested'] = makeBuildConfig(
+                               builderType   = 'nightly',
+                               branchName    = 'comm-central-tested',
+                               hgBranch      = 'comm-central',
+                               mozillaCentralBranch = 'mozilla-central',
+                               tinderboxTree = 'ThunderbirdTested',
+                               wantNightly   = False,
+                               wantL10n      = False
+                           )
+BRANCHES['comm-central-tested-bloat'] = makeBuildConfig(
+                               builderType   = 'bloat',
+                               branchName    = 'comm-central-tested',
+                               hgBranch      = 'comm-central',
+                               mozillaCentralBranch = 'mozilla-central',
+                               tinderboxTree = 'ThunderbirdTested',
+                               wantL10n      = False
+                           )
+
 BRANCHES['comm-1.9.2'] = makeBuildConfig(
                                builderType   = 'nightly',
                                branchName    = 'comm-1.9.2',
                                hgBranch      = 'releases/comm-1.9.2',
                                mozillaCentralBranch = 'releases/mozilla-1.9.2',
                                tinderboxTree = 'Thunderbird3.1',
                                allLocalesFile = 'all-locales.comm-1.9.2',
                                wantL10n      = True,