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

in case we fail a job in task manager, we need to add the project update to the inventoryupdate.source_project field

Browse Source
This commit is contained in:
Seth Foster
2022-05-12 15:21:17 -04:00
parent 0ae9fe3624
commit eba4a3f1c2
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/main/scheduler/task_manager.py
View File

@@ -395,11 +395,9 @@ class TaskManager:
if task.project is not None and task.project.scm_update_on_launch is True: if task.project is not None and task.project.scm_update_on_launch is True:
latest_project_update = self.get_latest_project_update(task.project_id) latest_project_update = self.get_latest_project_update(task.project_id)
if self.should_update_related_project(task, latest_project_update): if self.should_update_related_project(task, latest_project_update):
project_task = self.create_project_update(task) latest_project_update = self.create_project_update(task)
created_dependencies.append(project_task) created_dependencies.append(latest_project_update)
dependencies.append(project_task) dependencies.append(latest_project_update)
else:
dependencies.append(latest_project_update)
# Inventory created 2 seconds behind job # Inventory created 2 seconds behind job
try: try:
@@ -438,7 +436,7 @@ class TaskManager:
latest_src_project_update = self.create_project_update(inventory_task, project_id=invsrc.source_project_id) latest_src_project_update = self.create_project_update(inventory_task, project_id=invsrc.source_project_id)
created_dependencies.append(latest_src_project_update) created_dependencies.append(latest_src_project_update)
self.add_dependencies(inventory_task, [latest_src_project_update]) self.add_dependencies(inventory_task, [latest_src_project_update])
latest_src_project_update.scm_inventory_updates.add(inventory_task)
return created_dependencies return created_dependencies
def generate_dependencies(self, undeped_tasks): def generate_dependencies(self, undeped_tasks):