Fix ansible-test handling of integration dir.

pull/28836/merge
Matt Clay 7 years ago
parent dca887a6dc
commit bda0f6e241

@ -216,6 +216,7 @@ class PathMapper(object):
:type path: str :type path: str
:rtype: dict[str, str] | None :rtype: dict[str, str] | None
""" """
dirname = os.path.dirname(path)
filename = os.path.basename(path) filename = os.path.basename(path)
name, ext = os.path.splitext(filename) name, ext = os.path.splitext(filename)
@ -398,29 +399,30 @@ class PathMapper(object):
} }
if path.startswith('test/integration/'): if path.startswith('test/integration/'):
if self.prefixes.get(name) == 'network' and ext == '.yaml': if dirname == 'test/integration':
return minimal # network integration test playbooks are not used by ansible-test if self.prefixes.get(name) == 'network' and ext == '.yaml':
return minimal # network integration test playbooks are not used by ansible-test
if filename == 'platform_agnostic.yaml':
return minimal # network integration test playbook not used by ansible-test if filename == 'platform_agnostic.yaml':
return minimal # network integration test playbook not used by ansible-test
for command in (
'integration', for command in (
'windows-integration', 'integration',
'network-integration', 'windows-integration',
): 'network-integration',
if name == command: ):
return { if name == command and ext == '.cfg':
command: self.integration_all_target, return {
} command: self.integration_all_target,
}
if name.startswith('cloud-config-'): if name.startswith('cloud-config-'):
cloud_target = 'cloud/%s/' % name.split('-')[2].split('.')[0] cloud_target = 'cloud/%s/' % name.split('-')[2].split('.')[0]
if cloud_target in self.integration_targets_by_alias: if cloud_target in self.integration_targets_by_alias:
return { return {
'integration': cloud_target, 'integration': cloud_target,
} }
return { return {
'integration': self.integration_all_target, 'integration': self.integration_all_target,

Loading…
Cancel
Save