From e603c23b407a8ec8a7f8e182d029b188b3bb5077 Mon Sep 17 00:00:00 2001 From: Elijah DeLee Date: Mon, 11 Jul 2022 09:49:23 -0400 Subject: [PATCH] fix sliced jobs blocking logic in depedency graph We have to look at the sliced job's unified_job_template_id Now, task_blocked_by works for sliced jobs too. --- awx/main/scheduler/dependency_graph.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/awx/main/scheduler/dependency_graph.py b/awx/main/scheduler/dependency_graph.py index 711ea27b89..84215757c2 100644 --- a/awx/main/scheduler/dependency_graph.py +++ b/awx/main/scheduler/dependency_graph.py @@ -96,7 +96,11 @@ class DependencyGraph(object): def workflow_job_blocked_by(self, job): if job.allow_simultaneous is False: - return self.get_item(self.WORKFLOW_JOB_TEMPLATES_JOBS, job.workflow_job_template_id) + if job.workflow_job_template_id: + return self.get_item(self.WORKFLOW_JOB_TEMPLATES_JOBS, job.workflow_job_template_id) + elif job.unified_job_template_id: + # Sliced jobs are WorkflowJob type but do not have a workflow_job_template_id + return self.get_item(self.WORKFLOW_JOB_TEMPLATES_JOBS, job.unified_job_template_id) return None def system_job_blocked_by(self, job):