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

treat canceled jobs in wf the same as failed jobs

Browse Source 
* Also fix spelling mistake that caused workflows to be falsely marked
successful in the case of a canceled job.
This commit is contained in:
chris meyers
2018-11-15 10:23:58 -05:00
parent b527d89f55
commit d0d9a0060b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,7 +90,7 @@ class WorkflowDAG(SimpleDAG):
continue continue
if obj.job: if obj.job:
if obj.job.status in ['failed', 'error']: if obj.job.status in ['failed', 'error', 'canceled']:
nodes.extend(self.get_dependencies(obj, 'failure_nodes') + nodes.extend(self.get_dependencies(obj, 'failure_nodes') +
self.get_dependencies(obj, 'always_nodes')) self.get_dependencies(obj, 'always_nodes'))
elif obj.job.status == 'successful': elif obj.job.status == 'successful':
@@ -127,7 +127,7 @@ class WorkflowDAG(SimpleDAG):
failed_nodes = [] failed_nodes = []
for node in self.nodes: for node in self.nodes:
obj = node['node_object'] obj = node['node_object']
if obj.job and obj.job.status in ['failed', 'anceled', 'error']: if obj.job and obj.job.status in ['failed', 'canceled', 'error']:
failed_nodes.append(node) failed_nodes.append(node)
for node in failed_nodes: for node in failed_nodes:
obj = node['node_object'] obj = node['node_object']