From 2b98fcdace03bafe68732e3c2638948ec2bbff49 Mon Sep 17 00:00:00 2001 From: Sasa Jovicic Date: Thu, 1 Feb 2024 13:58:14 +0100 Subject: [PATCH] Implement an option to choose a job type on relaunch (issue #14177) --- awx/api/serializers.py | 8 +++++++- awx/api/views/__init__.py | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index 1a1ee393fa31..a21dff1bf2b1 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -3352,11 +3352,17 @@ class JobRelaunchSerializer(BaseSerializer): choices=[('all', _('No change to job limit')), ('failed', _('All failed and unreachable hosts'))], write_only=True, ) + job_type = serializers.ChoiceField( + required=False, + allow_null=True, + choices=NEW_JOB_TYPE_CHOICES, + write_only=True, + ) credential_passwords = VerbatimField(required=True, write_only=True) class Meta: model = Job - fields = ('passwords_needed_to_start', 'retry_counts', 'hosts', 'credential_passwords') + fields = ('passwords_needed_to_start', 'retry_counts', 'hosts', 'job_type', 'credential_passwords') def validate_credential_passwords(self, value): pnts = self.instance.passwords_needed_to_start diff --git a/awx/api/views/__init__.py b/awx/api/views/__init__.py index e769b49ee370..ec8baa82e4ab 100644 --- a/awx/api/views/__init__.py +++ b/awx/api/views/__init__.py @@ -3435,6 +3435,7 @@ def post(self, request, *args, **kwargs): copy_kwargs = {} retry_hosts = serializer.validated_data.get('hosts', None) + job_type = serializer.validated_data.get('job_type', None) if retry_hosts and retry_hosts != 'all': if obj.status in ACTIVE_STATES: return Response( @@ -3455,6 +3456,8 @@ def post(self, request, *args, **kwargs): ) copy_kwargs['limit'] = ','.join(retry_host_list) + if job_type: + copy_kwargs['job_type'] = job_type new_job = obj.copy_unified_job(**copy_kwargs) result = new_job.signal_start(**serializer.validated_data['credential_passwords']) if not result: