Make task logic use consistent artifact dir location

awx/main/tasks.py

@@ -1222,10 +1222,11 @@ def final_run_hook(self, instance, status, private_data_dir, fact_modification_t
         Hook for any steps to run after job/task is marked as complete.
         """
         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/'
-        collections_info = os.path.join(private_data_dir, 'artifacts/', 'collections.json')
-        ansible_version_file = os.path.join(private_data_dir, 'artifacts/', 'ansible_version.txt')
+        collections_info = os.path.join(artifact_dir, 'collections.json')
+        ansible_version_file = os.path.join(artifact_dir, 'ansible_version.txt')
 
         if not os.path.exists(awx_profiling_dir):
             os.mkdir(awx_profiling_dir)
@@ -1979,7 +1980,7 @@ def final_run_hook(self, job, status, private_data_dir, fact_modification_times)
             return
         if job.use_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,
             )
 
@@ -2715,7 +2716,7 @@ def post_run_hook(self, inventory_update, status):
             return  # nothing to save, step out of the way to allow error reporting
 
         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:
             data = json.load(f)