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

Check for invalid tasks and mark created tasks as failed when constructing task chains

Browse Source
This commit is contained in:
Matthew Jones
2014-01-30 01:19:49 -05:00
parent 6ff98d87e9
commit 6afc584a4f
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
awx/main/models/jobs.py
View File

@@ -352,6 +352,8 @@ class Job(CommonTask):
run_tasks = [] run_tasks = []
inventory_updates_actual = [] inventory_updates_actual = []
project_update_actual = None project_update_actual = None
has_setup_failures = False
setup_failure_message = ""
project = self.project project = self.project
inventory = self.inventory inventory = self.inventory
@@ -359,22 +361,32 @@ class Job(CommonTask):
if project.scm_update_on_launch: if project.scm_update_on_launch:
project_update_details = project.update_signature() project_update_details = project.update_signature()
if not project_update_details: if not project_update_details:
# TODO: Set error here has_setup_failures = True
pass setup_failure_message = "Failed to check dependent project update task"
else: else:
runnable_tasks.append({'obj': project_update_details[0], runnable_tasks.append({'obj': project_update_details[0],
'sig': project_update_details[1], 'sig': project_update_details[1],
'type': 'project_update'}) 'type': 'project_update'})
if is_qs.count(): if is_qs.count() and not has_setup_failures:
for inventory_source in is_qs: for inventory_source in is_qs:
inventory_update_details = inventory_source.update_signature() inventory_update_details = inventory_source.update_signature()
if not inventory_update_details: if not inventory_update_details:
# TODO: Set error here has_setup_failures = True
pass setup_failure_message = "Failed to check dependent inventory update task"
break
else: else:
runnable_tasks.append({'obj': inventory_update_details[0], runnable_tasks.append({'obj': inventory_update_details[0],
'sig': inventory_update_details[1], 'sig': inventory_update_details[1],
'type': 'inventory_update'}) 'type': 'inventory_update'})
if has_setup_failures:
for each_task in runnable_tasks:
obj = each_task['obj']
obj.status = 'error'
obj.result_traceback = setup_failure_message
obj.save()
self.status = 'error'
self.result_traceback = setup_failure_message
self.save()
thisjob = {'type': 'job', 'id': self.id} thisjob = {'type': 'job', 'id': self.id}
for idx in xrange(len(runnable_tasks)): for idx in xrange(len(runnable_tasks)):
dependent_tasks = [{'type': r['type'], 'id': r['obj'].id} for r in runnable_tasks[idx:]] + [thisjob] dependent_tasks = [{'type': r['type'], 'id': r['obj'].id} for r in runnable_tasks[idx:]] + [thisjob]