Update integration test playbooks to work with most current Collections modules

awx_collection/plugins/modules/credential.py

@@ -51,6 +51,12 @@ options:
       description:
         - The credential type being created.
         - Can be a built-in credential type such as "Machine", or a custom credential type such as "My Credential Type"
+        - Choices include Amazon Web Services, Ansible Galaxy/Automation Hub API Token, Centrify Vault Credential Provider Lookup,
+          Container Registry, CyberArk AIM Central Credential Provider Lookup, CyberArk Conjur Secret Lookup, Google Compute Engine,
+          GitHub Personal Access Token, GitLab Personal Access Token, HashiCorp Vault Secret Lookup, HashiCorp Vault Signed SSH,
+          Insights, Machine, Microsoft Azure Key Vault, Microsoft Azure Resource Manager, Network, OpenShift or Kubernetes API
+          Bearer Token, OpenStack, Red Hat Ansible Automation Platform, Red Hat Satellite 6, Red Hat Virtualization, Source Control,
+          Thycotic DevOps Secrets Vault, Thycotic Secret Server, Vault, VMware vCenter, or a custom credential type
       type: str
     inputs:
       description:

awx_collection/plugins/modules/job_template.py

@@ -495,10 +495,10 @@ def main():
         if field_val is not None:
             new_fields[field_name] = field_val
 
-        # Special treatment of extra_vars parameter
-        extra_vars = module.params.get('extra_vars')
-        if extra_vars is not None:
-            new_fields['extra_vars'] = json.dumps(extra_vars)
+    # Special treatment of extra_vars parameter
+    extra_vars = module.params.get('extra_vars')
+    if extra_vars is not None:
+        new_fields['extra_vars'] = json.dumps(extra_vars)
 
     # Attempt to look up the related items the user specified (these will fail the module if not found)
     inventory = module.params.get('inventory')