Bug 1187966 - Set the env for periodic file update jobs so we can use TOOLTOOL_CACHE = r=nthomas
--- a/misc.py
+++ b/misc.py
@@ -2801,16 +2801,20 @@ def mirrorAndBundleArgs(config):
args.extend(["--bundle", bundle])
return args
def generatePeriodicFileUpdateBuilder(config, branch_name, platform, base_name, slaves):
pf = config['platforms'].get(platform, {})
extra_args = ['-b', config['repo_path']]
+ env = pf['env'].copy()
+ kwargs = {}
+ kwargs['env'] = env
+
extra_args += mirrorAndBundleArgs(config)
if pf['product_name'] is not None:
extra_args.extend(['-p', pf['product_name']])
if config['hg_username'] is not None:
extra_args.extend(['-u', config['hg_username']])
if config['hg_ssh_key'] is not None:
extra_args.extend(['-k', config['hg_ssh_key']])
if config['file_update_on_closed_tree'] is True:
@@ -2825,16 +2829,17 @@ def generatePeriodicFileUpdateBuilder(co
extra_args.extend(['--hpkp'])
periodic_file_update_factory = ScriptFactory(
"%s%s" % (config['hgurl'],
config['build_tools_repo_path']),
'scripts/periodic_file_updates/periodic_file_updates.sh',
interpreter='bash',
extra_args=extra_args,
+ **kwargs
)
periodic_file_update_builder = {
'name': '%s periodic file update' % base_name,
'slavenames': slaves,
'builddir': '%s-%s-periodicupdate' % (branch_name, platform),
'slavebuilddir': normalizeName('%s-%s-periodicupdate' % (branch_name, platform)),
'factory': periodic_file_update_factory,
'category': branch_name,