cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Further cleanup of integration test inventory. (#50919)

Browse source 
* Further cleanup of integration test inventory.
* Preserve aci and msc inventory in template.
* Update ansible-test inventory template handling.
* Fix classification of inventory file.
This commit is contained in:
Matt Clay 2019-01-15 16:42:49 -08:00 committed by GitHub
parent 9e003d702f
commit 4d546398fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
test/integration/inventory
View file

@ -3,25 +3,3 @@
[testgroup] [testgroup]
testhost ansible_connection=local testhost ansible_connection=local
[aci:vars]
aci_hostname=your-apic-1
aci_username=admin
aci_password=your-apic-password
aci_validate_certs=no
aci_use_ssl=yes
aci_use_proxy=no
[aci]
localhost ansible_ssh_host=127.0.0.1 ansible_connection=local
[msc:vars]
msc_hostname=your-msc-1
msc_username=admin
msc_password=your-msc-password
msc_validate_certs=no
msc_use_ssl=yes
msc_use_proxy=no
[msc]
localhost ansible_ssh_host=127.0.0.1 ansible_connection=local

21
test/integration/inventory.networking.template
View file

@ -13,6 +13,27 @@
[@OS] [@OS]
@NAME ansible_connection="local" ansible_host=@HOST ansible_network_os="@OS" ansible_user="@USER" ansible_ssh_private_key_file="@KEY_FILE" @NAME ansible_connection="local" ansible_host=@HOST ansible_network_os="@OS" ansible_user="@USER" ansible_ssh_private_key_file="@KEY_FILE"
[aci:vars]
aci_hostname=your-apic-1
aci_username=admin
aci_password=your-apic-password
aci_validate_certs=no
aci_use_ssl=yes
aci_use_proxy=no
[aci]
localhost ansible_ssh_host=127.0.0.1 ansible_connection=local
[msc:vars]
msc_hostname=your-msc-1
msc_username=admin
msc_password=your-msc-password
msc_validate_certs=no
msc_use_ssl=yes
msc_use_proxy=no
[msc]
localhost ansible_ssh_host=127.0.0.1 ansible_connection=local
### ###
# Example # Example

8
test/runner/lib/classification.py
View file

@ -635,6 +635,14 @@ class PathMapper(object):
if filename == 'platform_agnostic.yaml': if filename == 'platform_agnostic.yaml':
return minimal # network integration test playbook not used by ansible-test return minimal # network integration test playbook not used by ansible-test
if filename.startswith('inventory.') and filename.endswith('.template'):
return minimal # ansible-test does not use these inventory templates
if filename == 'inventory':
return {
'integration': self.integration_all_target,
}
for command in ( for command in (
'integration', 'integration',
'windows-integration', 'windows-integration',