diff --git a/awx_collection/tests/integration/targets/bulk_job_launch/tasks/main.yml b/awx_collection/tests/integration/targets/bulk_job_launch/tasks/main.yml index f4a107ecfb..ac5609cf52 100644 --- a/awx_collection/tests/integration/targets/bulk_job_launch/tasks/main.yml +++ b/awx_collection/tests/integration/targets/bulk_job_launch/tasks/main.yml @@ -68,3 +68,7 @@ job_template: name: "{{ bulk_job_name }}" state: absent + register: del_res + until: del_res is succeeded + retries: 5 + delay: 3 diff --git a/awx_collection/tests/integration/targets/job_template/tasks/main.yml b/awx_collection/tests/integration/targets/job_template/tasks/main.yml index b8e5130090..07e49bed16 100644 --- a/awx_collection/tests/integration/targets/job_template/tasks/main.yml +++ b/awx_collection/tests/integration/targets/job_template/tasks/main.yml @@ -452,11 +452,14 @@ credential: "{{ cred3 }}" job_type: run state: absent - register: result + register: del_res + until: del_res is succeeded + retries: 5 + delay: 3 - assert: that: - - "result is changed" + - "del_res is changed" - name: Delete the Demo Project project: @@ -465,7 +468,6 @@ state: absent scm_type: git scm_url: https://github.com/ansible/ansible-tower-samples.git - register: result - name: Delete Credential1 credential: @@ -517,4 +519,3 @@ organization: name: "{{ org_name }}" state: absent - register: result diff --git a/awx_collection/tests/integration/targets/job_wait/tasks/main.yml b/awx_collection/tests/integration/targets/job_wait/tasks/main.yml index cc38e171d3..5748717a49 100644 --- a/awx_collection/tests/integration/targets/job_wait/tasks/main.yml +++ b/awx_collection/tests/integration/targets/job_wait/tasks/main.yml @@ -156,9 +156,17 @@ project: "{{ proj_name }}" inventory: "Demo Inventory" state: absent + register: del_res + until: del_res is succeeded + retries: 5 + delay: 3 - name: Delete the project project: name: "{{ proj_name }}" organization: Default state: absent + register: del_res + until: del_res is succeeded + retries: 5 + delay: 3 diff --git a/awx_collection/tests/integration/targets/role/tasks/main.yml b/awx_collection/tests/integration/targets/role/tasks/main.yml index 0e8999fe96..9c67800d37 100644 --- a/awx_collection/tests/integration/targets/role/tasks/main.yml +++ b/awx_collection/tests/integration/targets/role/tasks/main.yml @@ -279,24 +279,28 @@ with_items: - jt1 - jt2 - register: result - name: Delete the project project: name: "{{ project_name }}" organization: Default state: absent - register: result + register: del_res + until: del_res is succeeded + retries: 5 + delay: 3 - name: Delete the 2nd project project: name: "{{ project_name }}" organization: "{{ org2_name }}" state: absent - register: result + register: del_res + until: del_res is succeeded + retries: 5 + delay: 3 - name: Delete the 2nd organization organization: name: "{{ org2_name }}" state: absent - register: result diff --git a/awx_collection/tests/integration/targets/schedule/tasks/main.yml b/awx_collection/tests/integration/targets/schedule/tasks/main.yml index c61785d3b7..51c1fe8643 100644 --- a/awx_collection/tests/integration/targets/schedule/tasks/main.yml +++ b/awx_collection/tests/integration/targets/schedule/tasks/main.yml @@ -353,7 +353,10 @@ project: "{{ proj1 }}" playbook: hello_world.yml state: absent - ignore_errors: True + register: del_res + until: del_res is succeeded + retries: 5 + delay: 3 - name: Delete the jt2 job_template: @@ -361,7 +364,10 @@ project: "{{ proj2 }}" playbook: hello_world.yml state: absent - ignore_errors: True + register: del_res + until: del_res is succeeded + retries: 5 + delay: 3 - name: Delete the Project2 project: @@ -370,7 +376,10 @@ state: absent scm_type: git scm_url: https://github.com/ansible/ansible-tower-samples.git - ignore_errors: True + register: del_res + until: del_res is succeeded + retries: 5 + delay: 3 - name: Delete the Project1 project: @@ -379,7 +388,10 @@ state: absent scm_type: git scm_url: https://github.com/ansible/ansible-tower-samples.git - ignore_errors: True + register: del_res + until: del_res is succeeded + retries: 5 + delay: 3 - name: Delete Credential1 credential: