Continue work on collection ci (ansible#16071)

* Fix some patterns in collection test playbooks

* Revert change to ansible.builtin.user

* Revert change to WFJT for dup label error

* Add error handling and fix references

* Add back lookup organization

* Fix all remainingfailing syntax in workflow_job_template

* Allow creating galaxy credential types without an organization (ansible#16077)

* remove requirement for galaxy credentials to belong to an organization

* remove organization check for galaxy credential type

---------

Co-authored-by: AlanCoding <[email protected]>
Co-authored-by: Peter Braun <[email protected]>

Author: 3 people

awx_collection/plugins/modules/workflow_job_template_node.py

@@ -344,7 +344,10 @@ def main():
 
     unified_job_template = module.params.get('unified_job_template')
     if unified_job_template:
-        new_fields['unified_job_template'] = module.get_one('unified_job_templates', name_or_id=unified_job_template, **{'data': search_fields})['id']
+        ujt = module.get_one('unified_job_templates', name_or_id=unified_job_template, **{'data': search_fields})
+        if ujt is None or 'id' not in ujt:
+            module.fail_json(msg=f'Could not get unified_job_template name_or_id={unified_job_template} search_fields={search_fields}, got {ujt}')
+        new_fields['unified_job_template'] = ujt['id']
     inventory = module.params.get('inventory')
     if inventory:
         new_fields['inventory'] = module.resolve_name_to_id('inventories', inventory)

awx_collection/tests/integration/targets/schedule/tasks/main.yml

@@ -82,7 +82,7 @@
 
     - name: Use lookup to check that schedules was enabled
       ansible.builtin.set_fact:
-        schedules_enabled_test: "lookup('awx.awx.controller_api', 'schedules/{{result.id}}/').enabled"
+        schedules_enabled_test: "{{lookup('awx.awx.controller_api', 'schedules/{{result.id}}/').enabled | bool}}"
 
     - name: Newly created schedules should have API default value for enabled
       ansible.builtin.assert:
@@ -359,8 +359,7 @@
       loop:
         - "{{ sched1 }}"
         - "{{ sched2 }}"
-      failed_when: >
-        delete_schedules_results is failed
+      failed_when: false
 
     - name: Delete the jt1
       job_template:
@@ -395,6 +394,7 @@
       until: del_res is succeeded
       retries: 5
       delay: 3
+      failed_when: false
 
     - name: Delete the Project1
       project:
@@ -414,8 +414,7 @@
         organization: Default
         credential_type: Red Hat Ansible Automation Platform
         state: absent
-      failed_when: >
-        delete_credential1_fails
+      failed_when: false
 
     # Labels can not be deleted
 
@@ -424,8 +423,7 @@
         name: "{{ ee1 }}"
         image: "junk"
         state: absent
-      failed_when: >
-        delete_execution_environment_fails
+      failed_when: false
 
     - name: Delete instance groups
       instance_group:
@@ -434,29 +432,25 @@
       loop:
         - "{{ ig1 }}"
         - "{{ ig2 }}"
-      failed_when: >
-        delete_instance_groups_fails
+      failed_when: false
 
     - name: Remove the organization
       organization:
         name: "{{ org_name }}"
         state: absent
-      failed_when: >
-        remove_org_fails
+      failed_when: false
 
     - name: Delete slice inventory
       inventory:
         name: "{{ slice_inventory }}"
         organization: "{{ org_name }}"
         state: absent
-      failed_when: >
-        delete_slice_inventory_fails
+      failed_when: false
 
     - name: Delete slice hosts
       host:
         name: "{{ host_name }}-{{ item }}"
         inventory: "{{ slice_inventory }}"
         state: absent
       loop: "{{ range(slice_num)|list }}"
-      failed_when: >
-        delete_slice_hosts_fails
+      failed_when: false

awx_collection/tests/integration/targets/user/tasks/main.yml

@@ -9,8 +9,9 @@
     username: "AWX-Collection-tests-user-user-{{ test_id }}"
 
 - name: Create a User
-  ansible.builtin.user:
-    name: "{{ username }}"
+  awx.awx.user:
+    username: "{{ username }}"
+    first_name: Joe
     password: "{{ 65535 | random | to_uuid }}"
     state: present
   register: result
@@ -20,21 +21,23 @@
     that:
       - result.changed
 
-- name: Create a user with present
-  ansible.builtin.user:
-    name: "{{ username }}"
+- name: Create a User with exists
+  awx.awx.user:
+    username: "{{ username }}"
+    first_name: Joe
     password: "{{ 65535 | random | to_uuid }}"
-    state: present
+    state: exists
   register: result
 
 - name: Assert results did not change
   ansible.builtin.assert:
     that:
       - not result.changed
 
-- name: Delete a user
-  ansible.builtin.user:
-    name: "{{ username }}"
+- name: Delete a User
+  awx.awx.user:
+    username: "{{ username }}"
+    first_name: Joe
     password: "{{ 65535 | random | to_uuid }}"
     state: absent
   register: result
@@ -44,21 +47,24 @@
     that:
       - result.changed
 
-- name: Create a user with present
-  ansible.builtin.user:
-    name: "{{ username }}"
+- name: Create a User with exists
+  awx.awx.user:
+    username: "{{ username }}"
+    first_name: Joe
     password: "{{ 65535 | random | to_uuid }}"
-    state: present
+    state: exists
   register: result
 
 - name: Assert result changed
   ansible.builtin.assert:
     that:
       - result.changed
 
-- name: Change a user by ID
-  ansible.builtin.user:
-    name: "{{ result.id }}"
+- name: Change a User by ID
+  awx.awx.user:
+    username: "{{ result.id }}"
+    last_name: User
+    email: [email protected]
     state: present
   register: result
 
@@ -68,8 +74,10 @@
       - result.changed
 
 - name: Check idempotency
-  ansible.builtin.user:
-    name: "{{ username }}"
+  awx.awx.user:
+    username: "{{ username }}"
+    first_name: Joe
+    last_name: User
   register: result
 
 - name: Assert result did not change
@@ -78,8 +86,10 @@
       - not (result.changed)
 
 - name: Rename a User
-  ansible.builtin.user:
-    name: "{{ username }}"
+  awx.awx.user:
+    username: "{{ username }}"
+    new_username: "{{ username }}-renamed"
+    email: [email protected]
   register: result
 
 - name: Assert result changed
@@ -88,8 +98,9 @@
       - result.changed
 
 - name: Delete a User
-  ansible.builtin.user:
-    name: "{{ username }}-renamed"
+  awx.awx.user:
+    username: "{{ username }}-renamed"
+    email: [email protected]
     state: absent
   register: result
 
@@ -100,8 +111,11 @@
 
 - name: Create an Auditor
   awx.awx.user:
+    first_name: Joe
+    last_name: Auditor
     username: "{{ username }}"
     password: "{{ 65535 | random | to_uuid }}"
+    email: [email protected]
     state: present
     auditor: true
   register: result
@@ -140,8 +154,9 @@
       - result.changed
 
 - name: Delete a Superuser
-  ansible.builtin.user:
-    name: "{{ username }}"
+  awx.awx.user:
+    username: "{{ username }}"
+    email: [email protected]
     state: absent
   register: result
 
@@ -151,10 +166,15 @@
       - result.changed
 
 - name: Test SSL parameter
-  ansible.builtin.user:
-    name: "{{ username }}"
+  awx.awx.user:
+    first_name: Joe
+    last_name: User
+    username: "{{ username }}"
     password: "{{ 65535 | random | to_uuid }}"
+    email: [email protected]
     state: present
+    validate_certs: true
+    controller_host: http://foo.invalid
   ignore_errors: true
   register: result
 
@@ -226,7 +246,11 @@
     - name: Assert result failed
       ansible.builtin.assert:
         that:
-          - result.failed
+          - result is defined
+          - result.failed is defined
+          - result.failed | bool
+        fail_msg: "The task did not fail as expected."
+        success_msg: "The task failed as expected."
 
     - name: Create a User as -orgadmin using an organization
       awx.awx.user: