From 2f1f6620ef9f409934645f120bf626c23c1e1af4 Mon Sep 17 00:00:00 2001 From: Steve Fink Date: Mon, 10 Dec 2012 16:38:36 -0800 Subject: [PATCH] Bug 821097 - Pass through configuration data to spidermonkey jobs that need it for mock and/or try builds. r=bhearsum --- misc.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/misc.py b/misc.py index 8dfa48f7..a4407767 100644 --- a/misc.py +++ b/misc.py @@ -2465,13 +2465,21 @@ def generateSpiderMonkeyObjects(project, config, SLAVES): for a in factory_platform_args: if a in pf: factory_kwargs[a] = pf[a] + factory_kwargs['env'] = env + + extra_args = [ '-r', WithProperties("%(revision)s") ] + for url in config['branchconfig']['base_mirror_urls']: + extra_args += [ '-m', "%s/%s" % (url, config['repo_path']) ] + for url in config['branchconfig']['base_bundle_urls']: + extra_args += [ '-b', "%s/%s.hg" % (url, config['repo_path']) ] + extra_args += [variant] f = ScriptFactory( config['scripts_repo'], 'scripts/spidermonkey_builds/spidermonkey.sh', interpreter=interpreter, log_eval_func=rc_eval_func({1: WARNINGS}), - extra_args=(variant,), + extra_args=tuple(extra_args), script_timeout=3600, **factory_kwargs )