zuul
/
zuul
Code Issues Proposed changes

Merge "Include executor variables in initial setup call"

This commit is contained in:
Zuul 2018-11-26 23:06:43 +00:00 committed by Gerrit Code Review
parent 3476bb8788 bde27fa4ec
commit 04fe1101c7
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zuul/executor/server.py
View File

@ -1865,6 +1865,8 @@ class AnsibleJob(object):
cmd = ['ansible', '*', verbose, '-m', 'setup',
'-i', self.jobdir.setup_inventory,
'-a', 'gather_subset=!all']
if self.executor_variables_file is not None:
cmd.extend(['-e@%s' % self.executor_variables_file])
result, code = self.runAnsible(
cmd=cmd, timeout=60, playbook=playbook,