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

fix sliced jobs blocking logic in depedency graph

Browse Source 
We have to look at the sliced job's unified_job_template_id
Now, task_blocked_by works for sliced jobs too.
This commit is contained in:
Elijah DeLee
2022-07-11 09:49:23 -04:00
committed by Seth Foster
parent 8af4dd5988
commit e603c23b40
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -96,7 +96,11 @@ class DependencyGraph(object):
def workflow_job_blocked_by(self, job): def workflow_job_blocked_by(self, job):
if job.allow_simultaneous is False: 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 return None
def system_job_blocked_by(self, job): def system_job_blocked_by(self, job):