Fix ansible-test inventory and vars path handling. (#55186)

* Fix ansible-test inventory and vars path handling.
* Improve explanation for missing commit.
This commit is contained in:
Matt Clay 2019-04-12 11:52:44 -07:00 committed by GitHub
parent 39445786ff
commit a4d0c24bbf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 11 deletions

View file

@ -1241,7 +1241,7 @@ def command_integration_role(args, target, start_at_task, test_dir, inventory_pa
hosts=hosts,
gather_facts=gather_facts,
vars_files=[
test_env.vars_file,
os.path.relpath(test_env.vars_file, test_env.integration_dir),
],
roles=[
target.name,
@ -1262,7 +1262,7 @@ def command_integration_role(args, target, start_at_task, test_dir, inventory_pa
display.info('>>> Playbook: %s\n%s' % (filename, playbook.strip()), verbosity=3)
cmd = ['ansible-playbook', filename, '-i', test_env.inventory_path]
cmd = ['ansible-playbook', filename, '-i', os.path.relpath(test_env.inventory_path, test_env.integration_dir)]
if start_at_task:
cmd += ['--start-at-task', start_at_task]