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

adding fix for labels pushdown on workflow job nodes

Browse Source
This commit is contained in:
Sarabraj Singh
2022-09-15 09:10:24 -04:00
committed by Alan Rominger
parent ef90adb67e
commit 2369dc9621
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,6 +114,9 @@ class WorkflowNodeBase(CreatedModifiedModel, LaunchTimeConfig):
'credentials', 'credentials',
'char_prompts', 'char_prompts',
'all_parents_must_converge', 'all_parents_must_converge',
'labels',
'instance_groups',
'execution_environment',
] ]
def create_workflow_job_node(self, **kwargs): def create_workflow_job_node(self, **kwargs):
@@ -122,7 +125,7 @@ class WorkflowNodeBase(CreatedModifiedModel, LaunchTimeConfig):
""" """
create_kwargs = {} create_kwargs = {}
for field_name in self._get_workflow_job_field_names(): for field_name in self._get_workflow_job_field_names():
if field_name == 'credentials': if field_name in ['credentials', 'labels', 'instance_groups']:
continue continue
if field_name in kwargs: if field_name in kwargs:
create_kwargs[field_name] = kwargs[field_name] create_kwargs[field_name] = kwargs[field_name]
@@ -132,10 +135,20 @@ class WorkflowNodeBase(CreatedModifiedModel, LaunchTimeConfig):
new_node = WorkflowJobNode.objects.create(**create_kwargs) new_node = WorkflowJobNode.objects.create(**create_kwargs)
if self.pk: if self.pk:
allowed_creds = self.credentials.all() allowed_creds = self.credentials.all()
allowed_labels = self.labels.all()
allowed_instance_groups = self.instance_groups.all()
else: else:
allowed_creds = [] allowed_creds = []
allowed_labels = []
allowed_instance_groups = []
for cred in allowed_creds: for cred in allowed_creds:
new_node.credentials.add(cred) new_node.credentials.add(cred)
for label in allowed_labels:
new_node.labels.add(label)
for instance_group in allowed_instance_groups:
new_node.instance_groups.add(instance_group)
return new_node return new_node

2
awx/main/tests/unit/models/test_workflow_unit.py
View File

@@ -166,6 +166,7 @@ class TestWorkflowJobCreate:
unified_job_template=wfjt_node_no_prompts.unified_job_template, unified_job_template=wfjt_node_no_prompts.unified_job_template,
workflow_job=workflow_job_unit, workflow_job=workflow_job_unit,
identifier=mocker.ANY, identifier=mocker.ANY,
execution_environment=None,
) )
def test_create_with_prompts(self, wfjt_node_with_prompts, workflow_job_unit, credential, mocker): def test_create_with_prompts(self, wfjt_node_with_prompts, workflow_job_unit, credential, mocker):
@@ -181,6 +182,7 @@ class TestWorkflowJobCreate:
unified_job_template=wfjt_node_with_prompts.unified_job_template, unified_job_template=wfjt_node_with_prompts.unified_job_template,
workflow_job=workflow_job_unit, workflow_job=workflow_job_unit,
identifier=mocker.ANY, identifier=mocker.ANY,
execution_environment=None,
) )