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

Merge pull request #6044 from fosterseth/fix-4418-failing_successful_updates

Browse Source 
Do not fail a successful project update if inventory update fails

Reviewed-by: Seth Foster
             https://github.com/fosterseth
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-02-24 18:12:52 +00:00
committed by GitHub
parent 22307bba97 31dbf38a35
commit ccd4cdd71a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/tasks.py
View File

@@ -584,7 +584,7 @@ def handle_work_error(task_id, *args, **kwargs):
first_instance = instance first_instance = instance
first_instance_type = each_task['type'] first_instance_type = each_task['type']
if instance.celery_task_id != task_id and not instance.cancel_flag: if instance.celery_task_id != task_id and not instance.cancel_flag and not instance.status == 'successful':
instance.status = 'failed' instance.status = 'failed'
instance.failed = True instance.failed = True
if not instance.job_explanation: if not instance.job_explanation:
@@ -1692,7 +1692,7 @@ class RunJob(BaseTask):
if settings.MAX_FORKS > 0 and job.forks > settings.MAX_FORKS: if settings.MAX_FORKS > 0 and job.forks > settings.MAX_FORKS:
logger.warning(f'Maximum number of forks ({settings.MAX_FORKS}) exceeded.') logger.warning(f'Maximum number of forks ({settings.MAX_FORKS}) exceeded.')
args.append('--forks=%d' % settings.MAX_FORKS) args.append('--forks=%d' % settings.MAX_FORKS)
else: else:
args.append('--forks=%d' % job.forks) args.append('--forks=%d' % job.forks)
if job.force_handlers: if job.force_handlers:
args.append('--force-handlers') args.append('--force-handlers')