From 88d6552b867184d60ffe340bf6ba0ba73d80259d Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Wed, 30 Nov 2016 16:25:27 -0500 Subject: [PATCH] artifact data comes in as a dict --- awx/main/models/jobs.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/awx/main/models/jobs.py b/awx/main/models/jobs.py index 2688219d00..b5cf3bc307 100644 --- a/awx/main/models/jobs.py +++ b/awx/main/models/jobs.py @@ -1164,7 +1164,7 @@ class JobEvent(CreatedModifiedModel): # Save UUID and parent UUID for determining parent-child relationship. job_event_uuid = kwargs.get('uuid', None) parent_event_uuid = kwargs.get('parent_uuid', None) - artifact_data = kwargs.get('artifact_data', None) + artifact_dict = kwargs.get('artifact_data', None) # Sanity check: Don't honor keys that we don't recognize. valid_keys = {'job_id', 'event', 'event_data', 'playbook', 'play', @@ -1194,8 +1194,7 @@ class JobEvent(CreatedModifiedModel): cache.set(cache_key, job_event.id, 300) # Save artifact data to parent job (if provided). - if artifact_data: - artifact_dict = json.loads(artifact_data) + if artifact_dict: event_data = kwargs.get('event_data', None) if event_data and isinstance(event_data, dict): res = event_data.get('res', None)