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

Add regression test for overly agressive cleanup behavior

Browse Source
This commit is contained in:
Alan Rominger
2022-03-28 22:23:33 -04:00
parent 85ec83c3fd
commit deac08ba8a
2 changed files with 44 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/models/ha.py
View File

@@ -186,10 +186,12 @@ class Instance(HasPolicyEditsMixin, BaseModel):
returns a dict that is passed to the python interface for the runner method corresponding to that command
any kwargs will override that key=value combination in the returned dict
"""
vargs = dict(grace_period=60) # grace period of 60 minutes, need to set because CLI default will not take effect
vargs = dict()
if settings.AWX_CLEANUP_PATHS:
vargs['file_pattern'] = os.path.join(settings.AWX_ISOLATION_BASE_PATH, JOB_FOLDER_PREFIX % '*') + '*'
vargs.update(kwargs)
if not isinstance(vargs.get('grace_period'), int):
vargs['grace_period'] = 60 # grace period of 60 minutes, need to set because CLI default will not take effect
if 'exclude_strings' not in vargs and vargs.get('file_pattern'):
active_pks = list(
UnifiedJob.objects.filter(