Adjusting observabilityStrategy tests

roles/test_observabilityStrategy/tasks/main.yml

@@ -7,35 +7,42 @@
 - name: "Add observabilityStrategy: none to the spec section"
   ansible.builtin.shell:
     cmd: |
-      oc patch stf/default --type merge -p '{"spec":{"observabilityStrategy": "none"}}' && sleep 120
+      oc patch stf/default --type merge -p '{"spec":{"observabilityStrategy": "none"}}'
   changed_when: false
 
 
 - name: "Delete Grafana object"
   ansible.builtin.shell:
     cmd: |
-      oc delete grafana default && sleep 60
+      oc delete grafana default && while oc get po -l app=grafana | grep grafana; do sleep 1; done;
   changed_when: false
 
 
 - name: "Delete Prometheus object"
   ansible.builtin.shell:
     cmd: |
-      oc delete prometheus default && sleep 60
+      oc delete prometheus default && while oc get po -l app=prometheus | grep prometheus; do sleep 1; done;
   changed_when: false
 
 
 - name: "Delete Alertmanager object"
   ansible.builtin.shell:
     cmd: |
-      oc delete alertmanager default && sleep 60
+      oc delete alertmanager default && while oc get po -l app=alertmanager | grep alertmanager; do sleep 1; done;
   changed_when: false
 
 
 - name: "Delete ElasticSearch  object"
   ansible.builtin.shell:
     cmd: |
-      oc delete elasticsearches.elasticsearch.k8s.elastic.co elasticsearch && sleep 60
+      oc delete elasticsearches.elasticsearch.k8s.elastic.co elasticsearch &&  while oc get po | grep elasticsearch; do sleep 1; done;
+  changed_when: false
+
+
+- name: "Wait 2 minutes before checking that pods didn't return"
+  ansible.builtin.shell:
+     cmd: |
+       sleep 120
   changed_when: false
 
 
@@ -49,7 +56,7 @@
 
 
 
-- name: "Verify that Grafana object didn't respawn"
+- name: "Verify that Grafana pod didn't respawn"
   ansible.builtin.shell:
      cmd: |
        oc get pods | grep grafana-deployment | wc -l
@@ -58,7 +65,7 @@
   changed_when: false
 
 
-- name: "Verify that Prometheus object didn't respawn"
+- name: "Verify that Prometheus pod didn't respawn"
   ansible.builtin.shell:
      cmd: |
        oc get pods | grep prometheus-default | wc -l
@@ -67,7 +74,7 @@
   changed_when: false
 
 
-- name: "Verify that Alertmanager object didn't respawn"
+- name: "Verify that Alertmanager pod didn't respawn"
   ansible.builtin.shell:
      cmd: |
        oc get pods | grep alertmanager-default | wc -l
@@ -76,7 +83,7 @@
   changed_when: false
 
 
-- name: "Verify that elasticsearch object didn't respawn"
+- name: "Verify that elasticsearch pod didn't respawn"
   ansible.builtin.shell:
      cmd: |
        oc get pods | grep elasticsearch | wc -l