Merge branch 'master' into mgirgis-endpoint-test-logging

ci/logging_tests_computes.yml

@@ -12,6 +12,6 @@
       - ceilometer_agent_compute
       - nova_compute
   tasks:
-    - name: "Verify journalctl logging identifiers"
+    - name: "Run Telemetry Logging tests"
       ansible.builtin.import_role:
         name: telemetry_logging

ci/logging_tests_controller.yml

@@ -6,9 +6,6 @@
   environment:
     KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
     PATH: "{{ cifmw_path }}"
-  vars_files:
-    - vars/common.yml
-    - vars/osp18_env.yml
   vars:
     common_pod_test_id: "RHOS0-12672"
     common_pod_status_str: "Running"
@@ -23,7 +20,7 @@
       - openstack-operators
       - openshift-logging
   tasks:
-    - name: "Verify the resources exist"
+    - name: "Verify projects exist"
       ansible.builtin.import_role:
         name: common
 

roles/common/README.md

@@ -79,17 +79,26 @@ can be set at the play level.
     environment:
       KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
       PATH: "{{ cifmw_path }}"
-    vars:
-      common_pod_test_id: "RHOSO-12752"
-      common_pod_status_str: "Running"
-      common_pod_nspace: openstack
-      common_pod_list:
-        - openstackclient
     tasks:
       - name: "Verify Running Pods"
         ansible.builtin.import_role:
           name: common
-
+        vars:
+            common_pod_test_id: "RHOSO-12752"
+            common_pod_status_str: "Running"
+            common_pod_nspace: openstack
+            common_pod_list:
+              - openstackclient
+
+      - name: "Verify status of multiple containers"
+        ansible.builtin.include_role:
+          name: common
+        vars:
+            common_container_test_id: "RHOSO-12753"
+            common_container_list:
+                - ceilometer_agent_compute
+                - ceilometer_agent_ipmi
+                - node_exporter
 
       - name: "Verify Endpoint"
         ansible.builtin.import_role:
@@ -110,7 +119,6 @@ can be set at the play level.
             - openshift-openstack-infra
             - openshift
 
-
 License
 -------
 

roles/common/tasks/container_test.yml

@@ -0,0 +1,15 @@
+---
+- name: Get container status
+  ansible.builtin.shell:
+    cmd: |
+      podman ps -a --format "{{ '{{.Names}} {{.Status}}' }}" | grep {{ item }}
+  changed_when: false
+  register: container_status
+
+
+- name: Verify container status {{ common_container_test_id }}
+  ansible.builtin.assert:
+    that:
+      - "'Up' in container_status.stdout"
+    success_msg: "Container '{{ item }}' is in 'Up' status."
+    fail_msg: "Container '{{ item }}' is not in 'Up' status. Current status: {{ container_status.stdout }}"

roles/common/tasks/main.yml

@@ -26,3 +26,9 @@
   ansible.builtin.include_tasks: "manifest_tests.yml"
   loop: "{{ manifest_list }}"
 
+- name: "Verify container tests"
+  when:
+    - common_container_list is defined
+    - common_container_test_id is defined
+  ansible.builtin.include_tasks: "container_test.yml"
+  loop: "{{ common_container_list }}"