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

Adding fields to job_metadata for workflows and approval nodes (#12255)

Browse Source
This commit is contained in:
John Westcott IV
2022-07-18 10:53:49 -04:00
committed by GitHub
parent cbb019ed09
commit 389c4a3180
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/main/models/notifications.py
View File

@@ -408,6 +408,7 @@ class JobNotificationMixin(object):
'inventory': 'Stub Inventory', 'inventory': 'Stub Inventory',
'id': 42, 'id': 42,
'hosts': {}, 'hosts': {},
'extra_vars': {},
'friendly_name': 'Job', 'friendly_name': 'Job',
'finished': False, 'finished': False,
'credential': 'Stub credential', 'credential': 'Stub credential',

16
awx/main/models/workflow.py
View File

@@ -659,6 +659,13 @@ class WorkflowJob(UnifiedJob, WorkflowJobOptions, SurveyJobMixin, JobNotificatio
node_job_description = 'job #{0}, "{1}", which finished with status {2}.'.format(node.job.id, node.job.name, node.job.status) node_job_description = 'job #{0}, "{1}", which finished with status {2}.'.format(node.job.id, node.job.name, node.job.status)
str_arr.append("- node #{0} spawns {1}".format(node.id, node_job_description)) str_arr.append("- node #{0} spawns {1}".format(node.id, node_job_description))
result['body'] = '\n'.join(str_arr) result['body'] = '\n'.join(str_arr)
result.update(
dict(
inventory=self.inventory.name if self.inventory else None,
limit=self.limit,
extra_vars=self.display_extra_vars(),
)
)
return result return result
@property @property
@@ -906,3 +913,12 @@ class WorkflowApproval(UnifiedJob, JobNotificationMixin):
@property @property
def workflow_job(self): def workflow_job(self):
return self.unified_job_node.workflow_job return self.unified_job_node.workflow_job
def notification_data(self):
result = super(WorkflowApproval, self).notification_data()
result.update(
dict(
extra_vars=self.workflow_job.display_extra_vars(),
)
)
return result