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

Block sliced workflow jobs on any job type from their JT (#12551)

Browse Source
This commit is contained in:
Alan Rominger
2022-07-20 16:27:51 -04:00
committed by Seth Foster
parent 957b2b7188
commit d06a3f060d
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/main/scheduler/dependency_graph.py
View File

@@ -99,8 +99,10 @@ class DependencyGraph(object):
if 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) return self.get_item(self.WORKFLOW_JOB_TEMPLATES_JOBS, job.workflow_job_template_id)
elif job.unified_job_template_id: elif job.unified_job_template_id:
# Sliced jobs are WorkflowJob type but do not have a workflow_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) 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 return None
def system_job_blocked_by(self, job): def system_job_blocked_by(self, job):