External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-20 02:17:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

save state

Browse Source
This commit is contained in:
chris meyers
2018-10-17 12:49:15 -04:00
committed by mabashian
parent 914892c3ac
commit 9bf2a49e0f
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
awx/main/scheduler/dag_workflow.py
View File

@@ -135,7 +135,7 @@ class WorkflowDAG(SimpleDAG):
node_ids_visited.add(obj.id) node_ids_visited.add(obj.id)
job = obj.job job = obj.job
if not job and obj.do_not_run is False and n not in root_nodes: if obj.do_not_run is False and not job and n not in root_nodes:
parent_nodes = [p['node_object'] for p in self.get_dependents(obj)] parent_nodes = [p['node_object'] for p in self.get_dependents(obj)]
all_parents_dnr = True all_parents_dnr = True
parent_run_path = False parent_run_path = False
@@ -165,19 +165,14 @@ class WorkflowDAG(SimpleDAG):
if all_parents_dnr and parent_run_path is False: if all_parents_dnr and parent_run_path is False:
obj.do_not_run = True obj.do_not_run = True
nodes_marked_do_not_run.append(n) nodes_marked_do_not_run.append(n)
elif obj.do_not_run is True:
nodes.extend(self.get_dependencies(obj, 'success_nodes') +
if obj.do_not_run: self.get_dependencies(obj, 'failure_nodes') +
children_success = self.get_dependencies(obj, 'success_nodes') self.get_dependencies(obj, 'always_nodes'))
children_failed = self.get_dependencies(obj, 'failure_nodes') elif job:
children_always = self.get_dependencies(obj, 'always_nodes') if job.status == 'failed':
children_all = children_failed + children_always nodes.extend(self.get_dependencies(obj, 'success_nodes'))
nodes.extend(children_all) elif job.status == 'successful':
elif job and job.status == 'failed': nodes.extend(self.get_dependencies(obj, 'failure_nodes'))
children_failed = self.get_dependencies(obj, 'success_nodes')
nodes.extend(children_failed)
elif job and job.status == 'successful':
children_success = self.get_dependencies(obj, 'failure_nodes')
nodes.extend(children_success)
return [n['node_object'] for n in nodes_marked_do_not_run] return [n['node_object'] for n in nodes_marked_do_not_run]