Permalink
Browse files

Merging from default

changeset:   3024:bb379a9285a1
tag:         tip
parent:      3019:5ea0122626d2
user:        Ben Hearsum <bhearsum@mozilla.com>
date:        Tue Feb 26 09:26:30 2013 -0500
summary:     738697: xulrunner nightly build logs go to tinderbox-builds/ instead of nightly/ - add 'nightly' to xulrunner builder names to fix log uploading. r=catlee

--HG--
branch : production-0.8
  • Loading branch information...
2 parents 1f5af28 + 59aa629 commit b681945c4b60e11aa51acc74e0c98edd3fb554c6 @rail rail committed Feb 26, 2013
Showing with 5 additions and 5 deletions.
  1. +5 −5 misc.py
View
10 misc.py
@@ -771,7 +771,7 @@ def generateBranchObjects(config, name, secrets=None):
if config.get('enable_blocklist_update', False) and platform in ('linux',):
weeklyBuilders.append('%s blocklist update' % base_name)
if pf.get('enable_xulrunner', config['enable_xulrunner']):
- xulrunnerNightlyBuilders.append('%s xulrunner' % base_name)
+ xulrunnerNightlyBuilders.append('%s xulrunner nightly' % base_name)
if config['enable_weekly_bundle']:
bundle_builder = makeBundleBuilder(config, name)
@@ -1723,14 +1723,14 @@ def generateBranchObjects(config, name, secrets=None):
enable_pymake=enable_pymake,
)
mozilla2_xulrunner_builder = {
- 'name': '%s xulrunner' % pf['base_name'],
+ 'name': '%s xulrunner nightly' % pf['base_name'],
'slavenames': pf['slaves'],
- 'builddir': '%s-%s-xulrunner' % (name, platform),
- 'slavebuilddir': normalizeName('%s-%s-xulrunner' % (name, platform), pf['stage_product']),
+ 'builddir': '%s-%s-xulrunner-nightly' % (name, platform),
+ 'slavebuilddir': normalizeName('%s-%s-xulrunner-nightly' % (name, platform), pf['stage_product']),
'factory': mozilla2_xulrunner_factory,
'category': name,
'nextSlave': _nextSlowSlave,
- 'properties': {'branch': name, 'platform': platform, 'slavebuilddir': normalizeName('%s-%s-xulrunner' % (name, platform)), 'product': 'xulrunner'},
+ 'properties': {'branch': name, 'platform': platform, 'slavebuilddir': normalizeName('%s-%s-xulrunner-nightly' % (name, platform)), 'product': 'xulrunner'},
}
branchObjects['builders'].append(mozilla2_xulrunner_builder)

0 comments on commit b681945

Please sign in to comment.