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

Make task logic use consistent artifact dir location

Browse Source
This commit is contained in:
Alan Rominger
2022-01-07 11:16:40 -05:00
parent eb64fde885
commit 8fac1c18c8
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
awx/main/tasks/jobs.py
View File

@@ -403,10 +403,11 @@ class BaseTask(object):
Hook for any steps to run after job/task is marked as complete. Hook for any steps to run after job/task is marked as complete.
""" """
instance.log_lifecycle("finalize_run") instance.log_lifecycle("finalize_run")
job_profiling_dir = os.path.join(private_data_dir, 'artifacts/playbook_profiling') artifact_dir = os.path.join(private_data_dir, 'artifacts', str(self.instance.id))
job_profiling_dir = os.path.join(artifact_dir, 'playbook_profiling')
awx_profiling_dir = '/var/log/tower/playbook_profiling/' awx_profiling_dir = '/var/log/tower/playbook_profiling/'
collections_info = os.path.join(private_data_dir, 'artifacts/', 'collections.json') collections_info = os.path.join(artifact_dir, 'collections.json')
ansible_version_file = os.path.join(private_data_dir, 'artifacts/', 'ansible_version.txt') ansible_version_file = os.path.join(artifact_dir, 'ansible_version.txt')
if not os.path.exists(awx_profiling_dir): if not os.path.exists(awx_profiling_dir):
os.mkdir(awx_profiling_dir) os.mkdir(awx_profiling_dir)
@@ -1160,7 +1161,7 @@ class RunJob(BaseTask):
return return
if job.use_fact_cache: if job.use_fact_cache:
job.finish_job_fact_cache( job.finish_job_fact_cache(
os.path.join(private_data_dir, 'artifacts', 'fact_cache'), os.path.join(private_data_dir, 'artifacts', str(job.id), 'fact_cache'),
fact_modification_times, fact_modification_times,
) )
@@ -1896,7 +1897,7 @@ class RunInventoryUpdate(BaseTask):
return # nothing to save, step out of the way to allow error reporting return # nothing to save, step out of the way to allow error reporting
private_data_dir = inventory_update.job_env['AWX_PRIVATE_DATA_DIR'] private_data_dir = inventory_update.job_env['AWX_PRIVATE_DATA_DIR']
expected_output = os.path.join(private_data_dir, 'artifacts', 'output.json') expected_output = os.path.join(private_data_dir, 'artifacts', str(inventory_update.id), 'output.json')
with open(expected_output) as f: with open(expected_output) as f:
data = json.load(f) data = json.load(f)