Permalink
Browse files

Merge bugs 805138, 802392, 794339, 775355, and 803680 to production

--HG--
branch : production-0.8
  • Loading branch information...
2 parents c55ce2b + dc6442c commit c3ce7f8caa7a49f5adfe341fecef0f5bb5e6beeb @mozbhearsum mozbhearsum committed Oct 30, 2012
Showing with 125 additions and 40 deletions.
  1. +0 −1 common.py
  2. +37 −9 misc.py
  3. +7 −6 process/release.py
  4. +81 −19 test/test_try_parser.py
  5. +0 −5 try_parser.py
View
@@ -68,7 +68,6 @@ def reallyShort(name, product=None):
'linux64': 'lnx64',
'android': 'andrd',
'release': 'rel',
- 'mochitests': 'mochi',
'mochitest': 'm',
'browser-chrome': 'b-c',
'other': 'oth',
View
46 misc.py
@@ -194,8 +194,8 @@ def generateTestBuilderNames(name_prefix, suites_name, suites):
if isinstance(suites, dict) and "totalChunks" in suites:
totalChunks = suites['totalChunks']
for i in range(totalChunks):
- test_builders.append('%s %s-%i/%i' % \
- (name_prefix, suites_name, i+1, totalChunks))
+ test_builders.append('%s %s-%i' % \
+ (name_prefix, suites_name, i+1))
else:
test_builders.append('%s %s' % (name_prefix, suites_name))
@@ -540,7 +540,7 @@ def generateTestBuilder(config, branch_name, platform, name_prefix,
resetHwClock=resetHwClock,
)
builder = {
- 'name': '%s %s-%i/%i' % (name_prefix, suites_name, i+1, totalChunks),
+ 'name': '%s %s-%i' % (name_prefix, suites_name, i+1),
'slavenames': slavenames,
'builddir': '%s-%s-%i' % (build_dir_prefix, suites_name, i+1),
'slavebuilddir': 'test',
@@ -2352,11 +2352,13 @@ def generateNanojitObjects(config, SLAVES):
'status': status,
}
-def generateSpiderMonkeyObjects(config, SLAVES):
+def generateSpiderMonkeyObjects(project, config, SLAVES):
builders = []
branch = os.path.basename(config['repo_path'])
- for platform, variants in config['platforms'].items():
+ PRETTY_NAME = '%s %s-%s build'
+ prettyNames = {}
+ for platform, variants in config['variants'].items():
base_platform = platform.split('-', 1)[0]
if 'win' in platform:
slaves = SLAVES[base_platform]
@@ -2368,20 +2370,34 @@ def generateSpiderMonkeyObjects(config, SLAVES):
slaves = SLAVES[base_platform]
interpreter = None
- env = config['env'][platform].copy()
+ pf = config['platforms'][platform]
+ env = pf['env'].copy()
env['HG_REPO'] = config['hgurl'] + config['repo_path']
for variant in variants:
+ factory_platform_args = [ 'use_mock',
+ 'mock_target',
+ 'mock_packages',
+ 'mock_copyin_files' ]
+ factory_kwargs = {}
+ for a in factory_platform_args:
+ if a in pf:
+ factory_kwargs[a] = pf[a]
+
f = ScriptFactory(
config['scripts_repo'],
'scripts/spidermonkey_builds/spidermonkey.sh',
interpreter=interpreter,
log_eval_func=rc_eval_func({1: WARNINGS}),
extra_args=(variant,),
script_timeout=3600,
+ **factory_kwargs
)
- builder = {'name': '%s_%s_spidermonkey-%s' % (branch, platform, variant),
+ prettyName = PRETTY_NAME % (project, pf['base_name'], variant)
+ prettyNames[platform] = prettyName
+
+ builder = {'name': prettyName,
'builddir': '%s_%s_spidermonkey-%s' % (branch, platform, variant),
'slavebuilddir': reallyShort('%s_%s_spidermonkey-%s' % (branch, platform, variant)),
'slavenames': slaves,
@@ -2403,12 +2419,24 @@ def isImportant(change):
return False
# Set up scheduler
- scheduler = Scheduler(
+ extra_args = {}
+ scheduler_class = None
+ if config.get('enable_try'):
+ scheduler_class = makePropertiesScheduler(BuilderChooserScheduler, [buildUIDSchedFunc])
+ extra_args['chooserFunc'] = tryChooser
+ extra_args['numberOfBuildsToTrigger'] = 1
+ extra_args['prettyNames'] = prettyNames
+ extra_args['buildbotBranch'] = branch
+ else:
+ scheduler_class = Scheduler
+
+ scheduler = scheduler_class(
name="%s_spidermonkey" % branch,
branch=config['repo_path'],
treeStableTimer=None,
builderNames=[b['name'] for b in builders],
fileIsImportant=isImportant,
+ **extra_args
)
return {
@@ -2544,7 +2572,7 @@ def generateProjectObjects(project, config, SLAVES):
# Spidermonkey
elif project.startswith('spidermonkey'):
- spiderMonkeyObjects = generateSpiderMonkeyObjects(config, SLAVES)
+ spiderMonkeyObjects = generateSpiderMonkeyObjects(project, config, SLAVES)
buildObjects = mergeBuildObjects(buildObjects, spiderMonkeyObjects)
# DXR
View
@@ -1765,12 +1765,13 @@ def hasPlatformSubstring(platforms, substring):
upstream_builders = [builderPrefix('push_to_mirrors')]
if releaseConfig.get('verifyConfigs'):
upstream_builders.append(builderPrefix('updates'))
- schedulers.append(AggregatingScheduler(
- name=builderPrefix('%s_uptake_check' % releaseConfig['productName']),
- branch=sourceRepoInfo['path'],
- upstreamBuilders=upstream_builders,
- builderNames=[builderPrefix('start_uptake_monitoring')]
- ))
+ if not releaseConfig.get('disableBouncerEntries'):
+ schedulers.append(AggregatingScheduler(
+ name=builderPrefix('%s_uptake_check' % releaseConfig['productName']),
+ branch=sourceRepoInfo['path'],
+ upstreamBuilders=upstream_builders,
+ builderNames=[builderPrefix('start_uptake_monitoring')]
+ ))
# This builder should be come after all AggregatingSchedulers are set
aggregating_shedulers = []
Oops, something went wrong.

0 comments on commit c3ce7f8

Please sign in to comment.