Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merging from default

changeset:   2623:2c8f96237300
parent:      2621:cd90d12a58fc
user:        Chris AtLee <catlee@mozilla.com>
date:        Tue Sep 25 10:32:35 2012 -0400
summary:     Bug 777530: Add timeouts for mozharness jobs. r=bhearsum

changeset:   2624:412092b4b528
tag:         tip
user:        Aki Sasaki <asasaki@mozilla.com>
date:        Tue Sep 25 09:37:40 2012 -0700
summary:     bug 793017 - mozharness desktop debug unittests. r=armenzg

--HG--
branch : production-0.8
  • Loading branch information...
commit fab54f1b9924dc249a2e1b91f5aaffd9fa484bce 2 parents 476c434 + af30f8e
@ccooper ccooper authored
Showing with 5 additions and 2 deletions.
  1. +5 −2 misc.py
View
7 misc.py
@@ -433,7 +433,7 @@ def generateTestBuilder(config, branch_name, platform, name_prefix,
scriptName=suites['script_path'],
hg_bin=suites['hg_bin'],
extra_args=suites.get('extra_args', []),
- script_maxtime=suites.get('script_maxtime', 1200),
+ script_maxtime=suites.get('script_maxtime', 3600),
reboot_command=suites.get('reboot_command'),
platform=platform,
log_eval_func=lambda c,s: regex_log_evaluator(c, s, (
@@ -585,6 +585,7 @@ def generateBranchObjects(config, name, secrets=None):
if 'mozharness_config' in pf:
buildername = '%s_dep' % pf['base_name']
builders.append(buildername)
+ prettyNames[platform] = buildername
continue
if platform.endswith("-debug"):
@@ -911,6 +912,8 @@ def generateBranchObjects(config, name, secrets=None):
scriptName=pf['mozharness_config']['script_name'],
extra_args=pf['mozharness_config'].get('extra_args'),
reboot_command=pf['mozharness_config'].get('reboot_command'),
+ script_timeout=pf.get('timeout', 3600),
+ script_maxtime=pf.get('maxTime', 4 * 3600),
)
builder = {
@@ -1951,7 +1954,7 @@ def generateTalosBranchObjects(branch, branch_config, PLATFORMS, SUITES,
}
if isinstance(suites, dict) and "mozharness_repo" in suites:
test_builder_kwargs['mozharness'] = True
- test_builder_kwargs['mozharness_python'] = platform_config['mozharness_python']
+ test_builder_kwargs['mozharness_python'] = platform_config['mozharness_config']['mozharness_python']
branchObjects['builders'].extend(generateTestBuilder(**test_builder_kwargs))
if create_pgo_builders and test_type == 'opt':
pgo_builder_kwargs = test_builder_kwargs.copy()
Please sign in to comment.
Something went wrong with that request. Please try again.