External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-15 11:50:42 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4176 from chrismeyersfsu/fix-artifacts

Browse Source 
artifact data comes in as a dict
This commit is contained in:
Chris Meyers 2016-11-30 16:38:40 -05:00 committed by GitHub
commit 5cf0b8929f
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
awx/main/models/jobs.py
View File

@ -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)