Merge Zuul Logging job

ci/logging_tests_computes.yml

@@ -19,6 +19,25 @@
       ansible.builtin.import_role:
         name: telemetry_logging
 
-    - name: "Run the tests from the common role"
+   - name: "Run the tests from the common role"
       ansible.builtin.import_role:
         name: common
+
+- name: "Verify ctlplane logging containers"
+  hosts: computes
+  gather_facts: no
+  ignore_errors: true
+  environment:
+    KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
+    PATH: "{{ cifmw_path }}"
+  vars:
+    common_container_test_id: "RHOSO-12753"
+    common_container_list:
+      - ceilometer_agent_compute
+      - ceilometer_agent_ipmi
+      - node_exporter
+
+  tasks:
+    - name: "Run file and container tests"
+      ansible.builtin.import_role:
+        name: common

ci/logging_tests_controller.yml

@@ -23,6 +23,37 @@
       - openshift
       - openstack-operators
       - openshift-logging
+    common_endpoint_test_id: "RHOSO-12682"
+    common_endpoint_list:
+      - [nova,compute,public]
+      - [nova,compute,internal]
+      - [placement,placement,public]
+      - [placement,placement,internal]
+      - [swift,object-store,public]
+      - [swift,object-store,internal]
+      - [cinderv3,volumev3,public]
+      - [cinderv3,volumev3,internal]
+      - [barbican,key-manager,public]
+      - [barbican,key-manager,internal]
+      - [keystone,identity,public]
+      - [keystone,identity,internal]
+      - [glance,image,public]
+      - [glance,image,internal]
+      - [neutron,network,public]
+      - [neutron,network,internal]
+
+
+    common_manifest_test_id: "RHOSO-12677"
+    common_manifest_list:
+      - "loki-operator 2"
+      - "loki-helm-operator 1"
+
+    common_node_test_id: "RHOSO-12671"
+    common_node_list:
+      - edpm-compute-0
+      - edpm-compute-1
+      - crc
+
     common_service_test_id: "RHOSO-12675"
     common_service_nspace: openshift-logging
     common_service_list:
@@ -42,6 +73,7 @@
       - logging-loki-query-frontend-grpc
       - logging-loki-query-frontend-http
       - openstack-logging
+
   tasks:
     - name: "Verify logging infrastructure components"
       ansible.builtin.import_role:
@@ -144,6 +176,24 @@
     common_pod_status_str: "Completed"
     common_pod_list:
       - logging-edpm-deployment-openstack-edpm-ipam
+      # I think that we deliberately removed the rest of this list
+      - bootstrap-edpm-deployment-logging
+      - configure-network-edpm-deployment-logging
+      - configure-os-edpm-deployment-logging
+      - download-cache-edpm-deployment-logging
+      - install-certs-edpm-deployment-logging
+      - install-os-edpm-deployment-logging
+      - libvirt-edpm-deployment-logging
+      - logging-edpm-deployment-logging-openstack-edpm
+      - neutron-metadata-edpm-deployment-logging
+      - nova-custom-edpm-deployment
+      - ovn-edpm-deployment-logging
+      - reboot-os-edpm-deployment-logging
+      - repo-setup-edpm-deployment-logging
+      - run-os-edpm-deployment-logging
+      - ssh-known-hosts-edpm-deployment-logging
+      - telemetry-edpm-deployment-logging
+      - validate-network-edpm-deployment-logging
   tasks:
     - name: "Run pods completed tests"
       ansible.builtin.import_role:
@@ -157,13 +207,21 @@
     KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
     PATH: "{{ cifmw_path }}"
   vars:
+    common_service_test_id: "RHOSO-12749"
+    common_service_nspace: openstack
+    common_service_list:
+      - nova-internal
+      - nova-metadata-internal
+      - nova-novncproxy-cell1-public
+      - nova-public
     common_crd_test_id: "RHOSO-12670"
     common_crd_list:
       - alertingrules.loki.grafana.com
       - lokistacks.loki.grafana.com
       - recordingrules.loki.grafana.com
       - rulerconfigs.loki.grafana.com
   tasks:
-    - name: "Run the crds tests"
+    - name: "Run Services and CRD tests"
       ansible.builtin.import_role:
         name: common
+