add field to JT for asking to skip tags

awx/api/serializers.py

@@ -1825,7 +1825,7 @@ class JobTemplateSerializer(UnifiedJobTemplateSerializer, JobOptionsSerializer):
     class Meta:
         model = JobTemplate
         fields = ('*', 'host_config_key', 'ask_variables_on_launch', 'ask_limit_on_launch',
-                  'ask_tags_on_launch', 'ask_job_type_on_launch', 'ask_inventory_on_launch',
+                  'ask_tags_on_launch', 'ask_skip_tags_on_launch', 'ask_job_type_on_launch', 'ask_inventory_on_launch',
                   'ask_credential_on_launch', 'survey_enabled', 'become_enabled', 'allow_simultaneous')
 
     def get_related(self, obj):
@@ -1907,17 +1907,12 @@ class JobTemplateSerializer(UnifiedJobTemplateSerializer, JobOptionsSerializer):
 class JobSerializer(UnifiedJobSerializer, JobOptionsSerializer):
 
     passwords_needed_to_start = serializers.ReadOnlyField()
-    ask_variables_on_launch = serializers.ReadOnlyField()
-    ask_limit_on_launch = serializers.ReadOnlyField()
-    ask_tags_on_launch = serializers.ReadOnlyField()
-    ask_job_type_on_launch = serializers.ReadOnlyField()
-    ask_inventory_on_launch = serializers.ReadOnlyField()
-    ask_credential_on_launch = serializers.ReadOnlyField()
 
     class Meta:
         model = Job
         fields = ('*', 'job_template', 'passwords_needed_to_start', 'ask_variables_on_launch',
-                  'ask_limit_on_launch', 'ask_tags_on_launch', 'ask_job_type_on_launch',
+                  'ask_limit_on_launch', 'ask_tags_on_launch',
+                  'ask_skip_tags_on_launch', 'ask_job_type_on_launch',
                   'ask_inventory_on_launch', 'ask_credential_on_launch')
 
     def get_related(self, obj):
@@ -2282,14 +2277,15 @@ class JobLaunchSerializer(BaseSerializer):
         fields = ('can_start_without_user_input', 'passwords_needed_to_start',
                   'extra_vars', 'limit', 'job_tags', 'skip_tags', 'job_type', 'inventory',
                   'credential', 'ask_variables_on_launch', 'ask_tags_on_launch',
-                  'ask_job_type_on_launch', 'ask_limit_on_launch',
+                  'ask_skip_tags_on_launch', 'ask_job_type_on_launch', 'ask_limit_on_launch',
                   'ask_inventory_on_launch', 'ask_credential_on_launch',
                   'survey_enabled', 'variables_needed_to_start',
                   'credential_needed_to_start', 'inventory_needed_to_start',
                   'job_template_data', 'defaults')
-        read_only_fields = ('ask_variables_on_launch', 'ask_limit_on_launch',
+        read_only_fields = (
-                            'ask_tags_on_launch', 'ask_job_type_on_launch',
+            'ask_variables_on_launch', 'ask_limit_on_launch', 'ask_tags_on_launch',
-                            'ask_inventory_on_launch', 'ask_credential_on_launch')
+            'ask_skip_tags_on_launch', 'ask_job_type_on_launch',
+            'ask_inventory_on_launch', 'ask_credential_on_launch')
         extra_kwargs = {
             'credential': {'write_only': True,},
             'limit': {'write_only': True,},

awx/api/templates/api/job_template_launch.md

@@ -8,6 +8,8 @@ The response will include the following fields:
   configured to prompt for variables upon launch (boolean, read-only)
 * `ask_tags_on_launch`: Flag indicating whether the job_template is
   configured to prompt for tags upon launch (boolean, read-only)
+* `ask_skip_tags_on_launch`: Flag indicating whether the job_template is
+  configured to prompt for skip_tags upon launch (boolean, read-only)
 * `ask_job_type_on_launch`: Flag indicating whether the job_template is
   configured to prompt for job_type upon launch (boolean, read-only)
 * `ask_limit_on_launch`: Flag indicating whether the job_template is

awx/main/access.py

@@ -981,8 +981,8 @@ class JobTemplateAccess(BaseAccess):
         field_whitelist = [
             'name', 'description', 'forks', 'limit', 'verbosity', 'extra_vars',
             'job_tags', 'force_handlers', 'skip_tags', 'ask_variables_on_launch',
-            'ask_tags_on_launch', 'ask_job_type_on_launch', 'ask_inventory_on_launch',
+            'ask_tags_on_launch', 'ask_job_type_on_launch', 'ask_skip_tags_on_launch',
-            'ask_credential_on_launch', 'survey_enabled',
+            'ask_inventory_on_launch', 'ask_credential_on_launch', 'survey_enabled',
 
             # These fields are ignored, but it is convenient for QA to allow clients to post them
             'last_job_run', 'created', 'modified',

awx/main/migrations/0027_v302_add_ask_skip_tags.py

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import awx.main.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0026_v300_credential_unique'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='jobtemplate',
+            name='ask_skip_tags_on_launch',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='credential',
+            name='read_role',
+            field=awx.main.fields.ImplicitRoleField(related_name='+', parent_role=[b'singleton:system_auditor', b'organization.auditor_role', b'use_role', b'admin_role'], to='main.Role', null=b'True'),
+        ),
+    ]

awx/main/models/jobs.py

@@ -199,6 +199,10 @@ class JobTemplate(UnifiedJobTemplate, JobOptions, ResourceMixin):
         blank=True,
         default=False,
     )
+    ask_skip_tags_on_launch = models.BooleanField(
+        blank=True,
+        default=False,
+    )
     ask_job_type_on_launch = models.BooleanField(
         blank=True,
         default=False,
@@ -418,7 +422,7 @@ class JobTemplate(UnifiedJobTemplate, JobOptions, ResourceMixin):
             extra_vars=self.ask_variables_on_launch,
             limit=self.ask_limit_on_launch,
             job_tags=self.ask_tags_on_launch,
-            skip_tags=self.ask_tags_on_launch,
+            skip_tags=self.ask_skip_tags_on_launch,
             job_type=self.ask_job_type_on_launch,
             inventory=self.ask_inventory_on_launch,
             credential=self.ask_credential_on_launch
@@ -550,6 +554,12 @@ class Job(UnifiedJob, JobOptions):
             return self.job_template.ask_tags_on_launch
         return False
 
+    @property
+    def ask_skip_tags_on_launch(self):
+        if self.job_template is not None:
+            return self.job_template.ask_skip_tags_on_launch
+        return False
+
     @property
     def ask_job_type_on_launch(self):
         if self.job_template is not None:

awx/main/tests/functional/api/test_job_runtime_params.py

@@ -37,6 +37,7 @@ def job_template_prompts(project, inventory, machine_credential):
             name='deploy-job-template',
             ask_variables_on_launch=on_off,
             ask_tags_on_launch=on_off,
+            ask_skip_tags_on_launch=on_off,
             ask_job_type_on_launch=on_off,
             ask_inventory_on_launch=on_off,
             ask_limit_on_launch=on_off,
@@ -54,6 +55,7 @@ def job_template_prompts_null(project):
         name='deploy-job-template',
         ask_variables_on_launch=True,
         ask_tags_on_launch=True,
+        ask_skip_tags_on_launch=True,
         ask_job_type_on_launch=True,
         ask_inventory_on_launch=True,
         ask_limit_on_launch=True,

awx/main/tests/functional/api/test_job_template.py

@@ -103,9 +103,10 @@ def test_edit_nonsenstive(patch, job_template_factory, alice):
         'extra_vars': '--',
         'job_tags': 'sometags',
         'force_handlers': True,
-        'skip_tags': True,
+        'skip_tags': 'thistag,thattag',
         'ask_variables_on_launch':True,
         'ask_tags_on_launch':True,
+        'ask_skip_tags_on_launch':True,
         'ask_job_type_on_launch':True,
         'ask_inventory_on_launch':True,
         'ask_credential_on_launch': True,