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

ansible-test: recursively scan setup dependencies (#49170)

Browse source 
* ansible-test: recursively scan setup dependencies

* removed need for default set()
This commit is contained in:
Jordan Borean 2018-11-28 06:38:27 +10:00 committed by GitHub
parent bafc1f8a41
commit 694c505452
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
test/runner/lib/target.py
View file

@ -342,8 +342,9 @@ def analyze_integration_target_dependencies(integration_targets):
:type integration_targets: list[IntegrationTarget] :type integration_targets: list[IntegrationTarget]
:rtype: dict[str,set[str]] :rtype: dict[str,set[str]]
""" """
hidden_role_target_names = set(t.name for t in integration_targets if t.type == 'role' and 'hidden/' in t.aliases) role_targets = [t for t in integration_targets if t.type == 'role']
normal_role_targets = [t for t in integration_targets if t.type == 'role' and 'hidden/' not in t.aliases] hidden_role_target_names = set(t.name for t in role_targets if 'hidden/' in t.aliases)
dependencies = collections.defaultdict(set) dependencies = collections.defaultdict(set)
# handle setup dependencies # handle setup dependencies
@ -352,7 +353,7 @@ def analyze_integration_target_dependencies(integration_targets):
dependencies[setup_target_name].add(target.name) dependencies[setup_target_name].add(target.name)
# intentionally primitive analysis of role meta to avoid a dependency on pyyaml # intentionally primitive analysis of role meta to avoid a dependency on pyyaml
for role_target in normal_role_targets: for role_target in role_targets:
meta_dir = os.path.join(role_target.path, 'meta') meta_dir = os.path.join(role_target.path, 'meta')
if not os.path.isdir(meta_dir): if not os.path.isdir(meta_dir):
@ -376,6 +377,23 @@ def analyze_integration_target_dependencies(integration_targets):
if hidden_target_name in meta_line: if hidden_target_name in meta_line:
dependencies[hidden_target_name].add(role_target.name) dependencies[hidden_target_name].add(role_target.name)
while True:
changes = 0
for dummy, dependent_target_names in dependencies.items():
for dependent_target_name in list(dependent_target_names):
new_target_names = dependencies.get(dependent_target_name)
if new_target_names:
for new_target_name in new_target_names:
if new_target_name not in dependent_target_names:
dependent_target_names.add(new_target_name)
changes += 1
dependent_target_names.remove(dependent_target_name)
if not changes:
break
return dependencies return dependencies