Bug 488368 - Bustage fixes for production pool. Make sure that we're notifying the correct Tinderbox tree. r=bhearsum
--- a/talos-pool/master.cfg
+++ b/talos-pool/master.cfg
@@ -131,17 +131,17 @@ for branch, branch_config in BRANCHES.it
s = scheduler_class(name='%s %s scheduler' % (branch, slave_platform),
branch='%s-%s' % (branch, platform),
treeStableTimer=0,
builderNames=[builder['name']],
numberOfBuildsToTrigger=chrome_tests,
)
c['schedulers'].append(s)
c['builders'].append(builder)
- branch_builders.append(builder)
+ branch_builders.append(builder['name'])
if nochrome_tests:
nochrome_factory = TalosFactory(
OS=slave_platform,
toolsDir="tools",
envName=platform_config['env_name'],
workdirBase="../talos-data",
buildBranch=buildBranch,
@@ -164,18 +164,18 @@ for branch, branch_config in BRANCHES.it
s = scheduler_class(name='%s %s nochrome scheduler' % (branch, slave_platform),
branch='%s-%s' % (branch, platform),
treeStableTimer=0,
builderNames=[builder['name']],
numberOfBuildsToTrigger=nochrome_tests,
)
c['schedulers'].append(s)
c['builders'].append(builder)
- branch_builders.append(builder)
+ branch_builders.append(builder['name'])
c['status'].append(tinderbox.TinderboxMailNotifier(
fromaddr="talos.buildbot@build.mozilla.org",
tree=branchName,
extraRecipients=["tinderbox-daemon@tinderbox.mozilla.org",],
relayhost="smtp.mozilla.org",
- builders=None,
+ builders=branch_builders,
useChangeTime=True,
logCompression="bzip2"))