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

Merge pull request #236 from chrismeyersfsu/fix-inventory_status_propogation

Browse Source 
inherit child job finish status
This commit is contained in:
Chris Meyers
2015-05-22 14:31:05 -04:00
parent 39b051346a 0be4485849
commit 2029bfb9b1
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/main/models/inventory.py
View File

@@ -1143,10 +1143,9 @@ class InventorySource(UnifiedJobTemplate, InventorySourceOptions):
return self.current_job.status return self.current_job.status
elif not self.last_job: elif not self.last_job:
return 'never updated' return 'never updated'
elif self.last_job_failed: # inherit the child job status
return 'failed'
else: else:
return 'successful' return self.last_job.status
else: else:
return 'none' return 'none'

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

@@ -253,12 +253,16 @@ class Project(UnifiedJobTemplate, ProjectOptions):
return self.current_job.status return self.current_job.status
elif not self.last_job: elif not self.last_job:
return 'never updated' return 'never updated'
# inherit the child job status on failure
elif self.last_job_failed: elif self.last_job_failed:
return 'failed' return self.last_job.status
# Even on a successful child run, a missing project path overides
# the successful status
elif not self.get_project_path(): elif not self.get_project_path():
return 'missing' return 'missing'
# Return the successful status
else: else:
return 'successful' return self.last_job.status
elif not self.get_project_path(): elif not self.get_project_path():
return 'missing' return 'missing'
else: else: