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

Fix child job->parent job status update.

Browse Source 
* refactored so that project shares parents _update_parent_instance() code
* allow parent job status field to be anything a child status job field can be
* fixed child job status to parent job status propagation
This commit is contained in:
Chris Meyers
2015-01-23 10:57:35 -05:00
parent 89eeadacdb
commit d051b6348b
3 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
awx/main/models/projects.py
View File

@@ -257,8 +257,8 @@ class Project(UnifiedJobTemplate, ProjectOptions):
def _get_current_status(self):
if self.scm_type:
if self.current_update:
return 'running'
if self.current_job and self.current_job.status:
return self.current_job.status
elif not self.last_job:
return 'never updated'
elif self.last_job_failed:
@@ -363,18 +363,8 @@ class ProjectUpdate(UnifiedJob, ProjectOptions):
def _update_parent_instance(self):
parent_instance = self._get_parent_instance()
if parent_instance:
if self.status in ('pending', 'waiting', 'running'):
if parent_instance.current_job != self:
parent_instance.current_job = self
parent_instance.save(update_fields=['current_job'])
elif self.status in ('successful', 'failed', 'error', 'canceled'):
if parent_instance.current_job == self:
parent_instance.current_job = None
parent_instance.last_job = self
parent_instance.last_job_failed = self.failed
if not self.failed and parent_instance.scm_delete_on_next_update:
parent_instance.scm_delete_on_next_update = False
parent_instance.save(update_fields=['current_job',
'last_job',
'last_job_failed',
'scm_delete_on_next_update'])
update_fields = self._update_parent_instance_no_save(parent_instance)
if not self.failed and parent_instance.scm_delete_on_next_update:
parent_instance.scm_delete_on_next_update = False
update_fields.append(scm_delete_on_next_update)
parent_instance.save(update_fields=update_fields)