Merge pull request #9464 from beeankha/test_playbook_cleanup

Integration Test Playbook Cleanup for Collections

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul

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

@@ -352,25 +352,6 @@
     that:
       - "result is changed"
 
-# We should decide when to delete this test
-- name: Create a valid Vault credential w/ kind=ssh (deprecated, will now fail)
-  tower_credential:
-    name: "{{ vault_cred_name2 }}"
-    organization: Default
-    state: present
-    kind: ssh
-    description: An example Vault credential
-    vault_password: secret-vault
-  register: result
-  ignore_errors: true
-
-- assert:
-    that:
-      - result is failed
-      - "'Unable to create credential {{ vault_cred_name2 }}' in result.msg"
-      - "'Additional properties are not allowed' in result.msg"
-      - "'\\'vault_password\\' was unexpected' in result.msg"
-
 - name: Delete a Vault credential
   tower_credential:
     name: "{{ vault_cred_name1 }}"

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

@@ -24,4 +24,4 @@
       - "'Non_existing_org' in result.msg"
       - "result.total_results == 0"
 
-# TODO: Deleting labels doesn't seem to work currently
+# You can't delete a label directly so no cleanup is necessary

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

@@ -36,7 +36,7 @@
 - assert:
     that:
       - results is failed
-      # We don't assert a message here because it handled by ansible
+      # We don't assert a message here because it's handled by ansible
 
 - name: Try to delete a token with both existing_token or existing_token_id
   tower_token:
@@ -50,7 +50,7 @@
 - assert:
     that:
       - results is failed
-      # We don't assert a message here because it handled by ansible
+      # We don't assert a message here because it's handled by ansible
 
 
 - block:

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

@@ -78,7 +78,6 @@
     project: "{{ demo_project_name }}"
     inventory: Demo Inventory
     playbook: hello_world.yml
-    credential: Demo Credential
     job_type: run
     state: present
   register: result
@@ -93,7 +92,6 @@
     project: "{{ demo_project_name }}"
     inventory: Demo Inventory
     playbook: hello_world.yml
-    credential: Demo Credential
     job_type: run
     state: present
   register: result
@@ -108,7 +106,6 @@
     project: "{{ demo_project_name }}"
     inventory: Demo Inventory
     playbook: hello_world.yml
-    credential: Demo Credential
     job_type: run
     state: present
     survey_enabled: true
@@ -287,7 +284,6 @@
     project: "{{ demo_project_name }}"
     inventory: Demo Inventory
     playbook: hello_world.yml
-    credential: Demo Credential
     job_type: run
     state: absent
   register: result
@@ -302,7 +298,6 @@
     project: "{{ demo_project_name }}"
     inventory: Demo Inventory
     playbook: hello_world.yml
-    credential: Demo Credential
     job_type: run
     state: absent
   register: result