From 7deddabea60166ca8808509756a080d63cffa97e Mon Sep 17 00:00:00 2001 From: lucas-benedito <55454581+lucas-benedito@users.noreply.github.com> Date: Fri, 17 Mar 2023 20:12:25 +0100 Subject: [PATCH] 8049-expose execution node var for playbook (#13418) Expose execution node var for playbook --------- Co-authored-by: Lucas Benedito --- awx/main/models/jobs.py | 3 +++ awx/main/tests/unit/models/test_unified_job_unit.py | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/awx/main/models/jobs.py b/awx/main/models/jobs.py index d4e473f7b7..61b87f4807 100644 --- a/awx/main/models/jobs.py +++ b/awx/main/models/jobs.py @@ -831,6 +831,9 @@ class Job(UnifiedJob, JobOptions, SurveyJobMixin, JobNotificationMixin, TaskMana for name in JOB_VARIABLE_PREFIXES: r['{}_job_template_id'.format(name)] = self.job_template.pk r['{}_job_template_name'.format(name)] = self.job_template.name + if self.execution_node: + for name in JOB_VARIABLE_PREFIXES: + r['{}_execution_node'.format(name)] = self.execution_node return r ''' diff --git a/awx/main/tests/unit/models/test_unified_job_unit.py b/awx/main/tests/unit/models/test_unified_job_unit.py index c7f62225c8..b6080f55f7 100644 --- a/awx/main/tests/unit/models/test_unified_job_unit.py +++ b/awx/main/tests/unit/models/test_unified_job_unit.py @@ -107,7 +107,11 @@ class TestMetaVars: result_hash['{}_user_id'.format(name)] = 47 result_hash['{}_inventory_id'.format(name)] = 45 result_hash['{}_inventory_name'.format(name)] = 'example-inv' - assert Job(name='fake-job', pk=42, id=42, launch_type='manual', created_by=maker, inventory=inv).awx_meta_vars() == result_hash + result_hash['{}_execution_node'.format(name)] = 'example-exec-node' + assert ( + Job(name='fake-job', pk=42, id=42, launch_type='manual', created_by=maker, inventory=inv, execution_node='example-exec-node').awx_meta_vars() + == result_hash + ) def test_project_update_metavars(self): data = Job(