Permalink
Browse files

Merge default to production

--HG--
branch : production-0.8
  • Loading branch information...
Callek committed Jan 1, 2013
2 parents 93ad647 + c56b7e6 commit 8ca8b09052e95ef5b12cdbb373a7bdc3afde71d7
Showing with 152 additions and 308 deletions.
  1. +14 −35 misc.py
  2. +1 −1 process/factory.py
  3. +108 −210 test/test_try_parser.py
  4. +29 −62 try_parser.py
View
49 misc.py
@@ -673,8 +673,7 @@ def generateBranchObjects(config, name, secrets=None):
weeklyBuilders = []
coverageBuilders = []
# prettyNames is a mapping to pass to the try_parser for validation
- PRETTY_NAME = '%(basename)s %(trystatus)sbuild'
- NAME = '%(basename)s build'
+ PRETTY_NAME = '%s build'
prettyNames = {}
unittestPrettyNames = {}
unittestSuites = []
@@ -703,6 +702,7 @@ def generateBranchObjects(config, name, secrets=None):
for platform in enabled_platforms:
pf = config['platforms'][platform]
base_name = pf['base_name']
+ pretty_name = PRETTY_NAME % base_name
# short-circuit the extra logic below for debug, l10n, pgo and nightly
# builds these aren't required (yet) for mozharness builds
@@ -718,15 +718,9 @@ def generateBranchObjects(config, name, secrets=None):
nightlyBuilders.append(buildername)
continue
- values = { 'basename': base_name,
- 'trystatus': '' if pf.get('try-by-default', True) else 'try-nondefault ',
- }
- pretty_name = PRETTY_NAME % values
- name = NAME % values
-
if platform.endswith("-debug"):
- builders.append(name)
- buildersByProduct.setdefault(pf['stage_product'], []).append(name)
+ builders.append(pretty_name)
+ buildersByProduct.setdefault(pf['stage_product'], []).append(pretty_name)
prettyNames[platform] = pretty_name
# Debug unittests
if pf.get('enable_unittests'):
@@ -744,8 +738,8 @@ def generateBranchObjects(config, name, secrets=None):
if not pf.has_key('enable_nightly'):
continue
elif pf.get('enable_dep', True):
- builders.append(name)
- buildersByProduct.setdefault(pf['stage_product'], []).append(name)
+ builders.append(pretty_name)
+ buildersByProduct.setdefault(pf['stage_product'], []).append(pretty_name)
prettyNames[platform] = pretty_name
# Fill the l10n dep dict
@@ -1912,22 +1906,13 @@ def generateTalosBranchObjects(branch, branch_config, PLATFORMS, SUITES,
talos_builders = {}
talos_pgo_builders = {}
- try_default = True
- if not branch_config['platforms'][platform].get('try-by-default', True):
- try_default = False
- elif not platform_config.get('try-by-default', True):
- try_default = False
-
for slave_platform in slave_platforms:
platform_name = platform_config[slave_platform]['name']
# this is to handle how a platform has more than one slave platform
- slave_platform_try_default = try_default
- if not platform_config[slave_platform].get('try-by-default', True):
- slave_platform_try_default = False
- platformPrettyName = platform_name
- if not slave_platform_try_default:
- platformPrettyName += ' try-nondefault'
- prettyNames.setdefault(platform, []).append(platformPrettyName)
+ if prettyNames.has_key(platform):
+ prettyNames[platform].append(platform_name)
+ else:
+ prettyNames[platform] = [platform_name]
for suite, talosConfig in SUITES.items():
tests, merge, extra, platforms = branch_config['%s_tests' % suite]
if tests == 0 or slave_platform not in platforms:
@@ -2458,8 +2443,7 @@ def generateNanojitObjects(config, SLAVES):
def generateSpiderMonkeyObjects(project, config, SLAVES):
builders = []
- branch = config['branch']
- bconfig = config['branchconfig']
+ branch = os.path.basename(config['repo_path'])
PRETTY_NAME = '%s %s-%s build'
prettyNames = {}
@@ -2484,9 +2468,9 @@ def generateSpiderMonkeyObjects(project, config, SLAVES):
factory_kwargs['env'] = env
extra_args = [ '-r', WithProperties("%(revision)s") ]
- for url in bconfig['base_mirror_urls']:
+ for url in config['branchconfig']['base_mirror_urls']:
extra_args += [ '-m', "%s/%s" % (url, config['repo_path']) ]
- for url in bconfig['base_bundle_urls']:
+ for url in config['branchconfig']['base_bundle_urls']:
extra_args += [ '-b', "%s/%s.hg" % (url, config['repo_path']) ]
extra_args += [variant]
@@ -2505,12 +2489,9 @@ def generateSpiderMonkeyObjects(project, config, SLAVES):
base_name = pf['base_name'] % config
prettyName = PRETTY_NAME % (base_name, project, variant)
- name = prettyName
- if not config.get('try-by-default', True):
- prettyName += ' try-nondefault'
prettyNames[platform] = prettyName
- builder = {'name': name,
+ builder = {'name': prettyName,
'builddir': '%s_%s_spidermonkey-%s' % (branch, platform, variant),
'slavebuilddir': reallyShort('%s_%s_spidermonkey-%s' % (branch, platform, variant)),
'slavenames': pf['slaves'],
@@ -2521,8 +2502,6 @@ def generateSpiderMonkeyObjects(project, config, SLAVES):
'properties': {'branch': branch, 'platform': platform, 'product': 'spidermonkey'},
}
builders.append(builder)
- if not bconfig.get('enable_merging', True):
- nomergeBuilders.append(name)
def isImportant(change):
if not shouldBuild(change):
View
@@ -4866,7 +4866,7 @@ def addRunTestSteps(self):
symbols_path=symbols_path,
maxTime=120*60, # Two Hours
))
- elif suite in ('reftest', 'reftestsmall' 'reftest-ipc', 'reftest-d2d', 'crashtest', \
+ elif suite in ('reftest', 'reftestsmall', 'reftest-ipc', 'reftest-d2d', 'crashtest', \
'crashtest-ipc', 'direct3D', 'opengl', 'opengl-no-accel', \
'reftest-no-d2d-d3d'):
if suite in ('direct3D', 'opengl'):
Oops, something went wrong.

0 comments on commit 8ca8b09

Please sign in to comment.