From d06a3f060d82d4693e563f936b4d83b1c71a4b7d Mon Sep 17 00:00:00 2001 From: Alan Rominger Date: Wed, 20 Jul 2022 16:27:51 -0400 Subject: [PATCH] Block sliced workflow jobs on any job type from their JT (#12551) --- awx/main/scheduler/dependency_graph.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/awx/main/scheduler/dependency_graph.py b/awx/main/scheduler/dependency_graph.py index 84215757c2..c0f2801f08 100644 --- a/awx/main/scheduler/dependency_graph.py +++ b/awx/main/scheduler/dependency_graph.py @@ -99,8 +99,10 @@ class DependencyGraph(object): 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) + # Sliced jobs can be either Job or WorkflowJob type, and either should block a sliced WorkflowJob + return self.get_item(self.WORKFLOW_JOB_TEMPLATES_JOBS, job.unified_job_template_id) or self.get_item( + self.JOB_TEMPLATE_JOBS, job.unified_job_template_id + ) return None def system_job_blocked_by(self, job):