diff --git a/ansible/collections/ansible_collections/agnosticd/ibm/roles/ibm_instructlab_service/tasks/scenarios/ibm_instructlab_service_destroy.yml b/ansible/collections/ansible_collections/agnosticd/ibm/roles/ibm_instructlab_service/tasks/scenarios/ibm_instructlab_service_destroy.yml index f87486865c7..268eadbca2b 100644 --- a/ansible/collections/ansible_collections/agnosticd/ibm/roles/ibm_instructlab_service/tasks/scenarios/ibm_instructlab_service_destroy.yml +++ b/ansible/collections/ansible_collections/agnosticd/ibm/roles/ibm_instructlab_service/tasks/scenarios/ibm_instructlab_service_destroy.yml @@ -13,13 +13,16 @@ retries: 5 delay: 10 until: r_login_command_result.rc == 0 - + - name: Delete IBM Cloud CoS instance with retries ansible.builtin.command: "ibmcloud resource service-instance-delete {{ ibmcloud_cos_instance_name }} -f" register: r_cos_delete_command_result retries: 5 delay: 30 until: r_cos_delete_command_result.rc == 0 + failed_when: + - r_cos_delete_command_result.rc != 0 + - '"was not found" not in r_cos_delete_command_result.stderr' - name: Delete IBM Cloud Trusted Profile with retries ansible.builtin.command: "ibmcloud iam trusted-profile-delete {{ ibmcloud_iam_trusted_profile_name }} -f" @@ -27,6 +30,9 @@ retries: 5 delay: 30 until: r_tp_delete_command_result.rc == 0 + failed_when: + - r_tp_delete_command_result.rc != 0 + - '"was not found" not in r_tp_delete_command_result.stderr' - name: Delete IBM Cloud resource group with retries ansible.builtin.command: "ibmcloud resource group-delete {{ ibmcloud_resource_group_name }} -f" @@ -34,8 +40,11 @@ retries: 5 delay: 30 until: r_rg_delete_command_result.rc == 0 + failed_when: + - r_rg_delete_command_result.rc != 0 + - '"was not found" not in r_rg_delete_command_result.stderr' environment: IBMCLOUD_API_KEY: "{{ ibmcloud_api_key }}" become: false - connection: local \ No newline at end of file + connection: local