Skip to content
Browse files

Merge from default

changeset:   2430:f18daf293de4
tag:         tip
parent:      2427:b5090e91e2ef
user:        Ben Hearsum <bhearsum@mozilla.com>
date:        Fri Jun 22 11:47:59 2012 -0400
summary:     Bug 758425 - Build B2G in debug mode as well; r=rail

--HG--
branch : production-0.8
  • Loading branch information...
2 parents 09e7905 + 16a1259 commit b184b158afc4de0b5a29049f0fc23b33c03902b7 @rail rail committed
Showing with 23 additions and 18 deletions.
  1. +2 −1 common.py
  2. +20 −16 misc.py
  3. +1 −1 process/factory.py
View
3 common.py
@@ -7,7 +7,8 @@ def getCodesighsPlatforms():
def getSupportedPlatforms():
return ('linux', 'linuxqt','linux64',
'win32', 'macosx', 'macosx64',
- 'win64', 'android', 'b2g')
+ 'win64', 'android', 'b2g',
+ 'gb_armv7a_gecko',)
def getPlatformFtpDir(platform):
platform_ftp_map = {
View
36 misc.py
@@ -785,8 +785,13 @@ def generateBranchObjects(config, name, secrets=None):
nomergeBuilders.extend(periodicPgoBuilders) # these should never, ever merge
extra_args['treeStableTimer'] = None
+ if 'product_prefix' in config:
+ scheduler_name_prefix = "%s_%s" % (config['product_prefix'], name)
+ else:
+ scheduler_name_prefix = name
+
branchObjects['schedulers'].append(scheduler_class(
- name=name,
+ name=scheduler_name_prefix,
branch=config['repo_path'],
builderNames=builders + unittestBuilders + debugBuilders,
fileIsImportant=lambda c: isHgPollerTriggered(c, config['hgurl']) and shouldBuild(c),
@@ -860,7 +865,7 @@ def generateBranchObjects(config, name, secrets=None):
SpecificNightly,
[buildIDSchedFunc, buildUIDSchedFunc])(
ssFunc=goodFunc,
- name="%s nightly" % name,
+ name="%s nightly" % scheduler_name_prefix,
branch=config['repo_path'],
# bug 482123 - keep the minute to avoid problems with DST
# changes
@@ -874,7 +879,7 @@ def generateBranchObjects(config, name, secrets=None):
SpecificNightly,
[buildIDSchedFunc, buildUIDSchedFunc])(
ssFunc=lastRevFunc(config['repo_path'], triggerBuildIfNoChanges=False),
- name="%s pgo" % name,
+ name="%s pgo" % scheduler_name_prefix,
branch=config['repo_path'],
builderNames=periodicPgoBuilders,
hour=range(0,24,config['periodic_pgo_interval']),
@@ -895,14 +900,15 @@ def generateBranchObjects(config, name, secrets=None):
localesURL=config.get('localesURL', None)
))
- weekly_scheduler = Nightly(
- name='weekly-%s' % name,
- branch=config['repo_path'],
- dayOfWeek=5, # Saturday
- hour=[3], minute=[02],
- builderNames=coverageBuilders + weeklyBuilders,
- )
- branchObjects['schedulers'].append(weekly_scheduler)
+ if coverageBuilders or weeklyBuilders:
+ weekly_scheduler = Nightly(
+ name='weekly-%s' % scheduler_name_prefix,
+ branch=config['repo_path'],
+ dayOfWeek=5, # Saturday
+ hour=[3], minute=[02],
+ builderNames=coverageBuilders + weeklyBuilders,
+ )
+ branchObjects['schedulers'].append(weekly_scheduler)
# We iterate throught the platforms a second time, so we need
# to ensure that disabled platforms aren't configured the second time
@@ -926,10 +932,10 @@ def generateBranchObjects(config, name, secrets=None):
# on the needed builders
stage_platform = pf.get('stage_platform', platform)
- uploadPackages = True
+ uploadPackages = pf.get('uploadPackages', True)
uploadSymbols = False
packageTests = False
- talosMasters = pf['talos_masters']
+ talosMasters = pf.get('talos_masters', [])
unittestBranch = "%s-%s-opt-unittest" % (name, platform)
# Generate the PGO branch even if it isn't on for dep builds
# because we will still use it for nightlies... maybe
@@ -947,8 +953,6 @@ def generateBranchObjects(config, name, secrets=None):
# Platform already has the -debug suffix
unittestBranch = "%s-%s-unittest" % (name, platform)
tinderboxBuildsDir = "%s-%s" % (name, platform)
- elif 'b2g' in platform:
- uploadPackages = pf.get('uploadPackages', False)
else:
if pf.get('enable_opt_unittests'):
packageTests=True
@@ -2248,7 +2252,7 @@ def generateCCBranchObjects(config, name, secrets=None):
uploadPackages = True
uploadSymbols = False
packageTests = False
- talosMasters = pf['talos_masters']
+ talosMasters = pf.get('talos_masters', [])
unittestBranch = "%s-%s-opt-unittest" % (name, platform)
# Generate the PGO branch even if it isn't on for dep builds
# because we will still use it for nightlies... maybe
View
2 process/factory.py
@@ -894,7 +894,7 @@ def __init__(self, objdir, platform, configRepoPath, configSubDir,
else:
self.platform_variation = []
- assert self.platform in getSupportedPlatforms()
+ assert self.platform in getSupportedPlatforms(), "%s not in %s" % (self.platform, getSupportedPlatforms())
if self.graphServer is not None:
self.tbPrint = False

0 comments on commit b184b15

Please sign in to comment.
Something went wrong with that request. Please try again.