mirror of
https://github.com/ansible/awx.git
synced 2024-10-31 15:21:13 +03:00
Merge pull request #4377 from ryanpetrello/fix-4376
fix a bug which can cause isolated artifact cleanup to fail Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
commit
a5c5874e20
@ -51,9 +51,11 @@ def main():
|
||||
try:
|
||||
re_match = re.match(r'\/tmp\/awx_\d+_.+', path)
|
||||
if re_match is not None:
|
||||
if subprocess.check_call(['ansible-runner', 'is-alive', path]) == 0:
|
||||
continue
|
||||
else:
|
||||
try:
|
||||
if subprocess.check_call(['ansible-runner', 'is-alive', path]) == 0:
|
||||
continue
|
||||
except subprocess.CalledProcessError:
|
||||
# the job isn't running anymore, clean up this path
|
||||
module.debug('Deleting path {} its job has completed.'.format(path))
|
||||
except (ValueError, IndexError):
|
||||
continue
|
||||
|
Loading…
Reference in New Issue
Block a user