From d0d9a0060be38914b6ae91c9d79bc94160b384dc Mon Sep 17 00:00:00 2001 From: chris meyers Date: Thu, 15 Nov 2018 10:23:58 -0500 Subject: [PATCH] treat canceled jobs in wf the same as failed jobs * Also fix spelling mistake that caused workflows to be falsely marked successful in the case of a canceled job. --- awx/main/scheduler/dag_workflow.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/awx/main/scheduler/dag_workflow.py b/awx/main/scheduler/dag_workflow.py index bd673f5dc1..05b45d3184 100644 --- a/awx/main/scheduler/dag_workflow.py +++ b/awx/main/scheduler/dag_workflow.py @@ -90,7 +90,7 @@ class WorkflowDAG(SimpleDAG): continue 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') + self.get_dependencies(obj, 'always_nodes')) elif obj.job.status == 'successful': @@ -127,7 +127,7 @@ class WorkflowDAG(SimpleDAG): failed_nodes = [] for node in self.nodes: 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) for node in failed_nodes: obj = node['node_object']