External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-04 19:08:30 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix bug where SCM inventory did not have a collections destination (#3795)

Browse Source 
* update inventory path to be in tmp project clone

* copy project folder for inventory scm launch type

* Optionally accept inventory collection paths from ansible.cfg
This commit is contained in:
Alan Rominger
2019-10-23 19:26:10 -04:00
committed by Ryan Petrello
parent fca9245536
commit acba5306c6
2 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/main/tests/functional/test_inventory_source_injectors.py
View File

@@ -264,6 +264,7 @@ def test_inventory_update_injected_content(this_kind, script_or_plugin, inventor
assert envvars.pop('ANSIBLE_INVENTORY_ENABLED') == ('auto' if use_plugin else 'script')
set_files = bool(os.getenv("MAKE_INVENTORY_REFERENCE_FILES", 'false').lower()[0] not in ['f', '0'])
env, content = read_content(private_data_dir, envvars, inventory_update)
env.pop('ANSIBLE_COLLECTIONS_PATHS', None) # collection paths not relevant to this test
base_dir = os.path.join(DATA, script_or_plugin)
if not os.path.exists(base_dir):
os.mkdir(base_dir)