Update the logging test playbooks

* rename loggin_tests_local playbook to logging_tests_controller
* Rename vars in ci/logging_tests_compute and loggin_tests_controller

ci/logging_tests_computes.yml

@@ -7,8 +7,8 @@
     KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
     PATH: "{{ cifmw_path }}"
   vars:
-    journal_test_id: "RHOSO-12681"
-    journal_list:
+    common_journal_test_id: "RHOSO-12681"
+    common_journal_list:
       - ceilometer_agent_compute
       - nova_compute
   tasks:
@@ -24,14 +24,14 @@
     KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
     PATH: "{{ cifmw_path }}"
   vars:
-    container_test_id: "RHOSO-12753"
-    container_list:
+    common_container_test_id: "RHOSO-12753"
+    common_container_list:
       - ceilometer_agent_compute
       - ceilometer_agent_ipmi
       - node_exporter
 
-    file_test_id: "RHOSO-12754"
-    file_list:
+    common_file_test_id: "RHOSO-12754"
+    common_file_list:
       - /etc/rsyslog.d/10-telemetry.conf
   tasks:
     - name: "Run file and container tests"

ci/logging_tests_controller.yml

@@ -7,22 +7,51 @@
     KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
     PATH: "{{ cifmw_path }}"
   vars:
-    common_pod_test_id: "RHOS0-12672"
-    common_pod_status_str: "Running"
-    common_pod_nspace: openstack-operators
-    common_pod_list:
-      - telemetry-operator-controller-manager
-      - openstack-operator-controller-manager
-    common_subscription_test_id: "RHOSO-12678"
-    common_subscription_nspace: openshift-operators-redhat
-    common_subscription_list:
-      - loki-operator
     common_project_test_id: "RHOSO-12668"
     common_project_list:
       - openshift-openstack-infra
       - 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_crd_test_id: "RHOSO-12670"
+    common_crd_list:
+      - alertingrules.loki.grafana.com
+      - lokistacks.loki.grafana.com
+      - recordingrules.loki.grafana.com
+      - rulerconfigs.loki.grafana.com
+
+    common_node_test_id: "RHOSO-12671"
+    common_node_list:
+      - edpm-compute-0
+      - edpm-compute-1
+      - crc
+
+    common_pod_test_id: "RHOS0-12672"
+    common_pod_status_str: "Running"
+    common_pod_nspace: openstack-operators
+    common_pod_list:
+      - telemetry-operator-controller-manager
+      - dataplane-operator-controller-manager
+
     common_service_test_id: "RHOSO-12675"
     common_service_nspace: openshift-logging
     common_service_list:
@@ -41,15 +70,22 @@
       - logging-loki-querier-http
       - logging-loki-query-frontend-grpc
       - logging-loki-query-frontend-http
+      - logging-view-plugin
       - openstack-logging
-    common_file_test_id: "RHOSO-12754"
-    common_file_list:
-      - /etc/rsyslog.d/10-telemetry.conf
+    common_manifest_test_id: "RHOSO-12677"
+    common_manifest_list:
+      - "loki-operator 2"
+      - "loki-helm-operator 1"
+    common_subscription_test_id: "RHOSO-12678"
+    common_subscription_nspace: openshift-operators-redhat
+    common_subscription_list:
+      - loki-operator
   tasks:
-    - name: "Verify logging infrastructure components"
+    - name: "Run logging project, endpoint, credential, node, pod, service, manifest and subscription tests"
       ansible.builtin.import_role:
         name: common
 
+
 - name: "Verify logging pods are running in openstack"
   hosts: controller
   gather_facts: no
@@ -82,6 +118,7 @@
     common_pod_nspace: openshift-operators-redhat
     common_pod_list:
       - loki-operator-controller-manager
+
   tasks:
     - name: "Verify Pods running"
       ansible.builtin.import_role:
@@ -100,34 +137,39 @@
     common_pod_nspace: openshift-logging
     common_pod_list:
       - cluster-logging-operator
+      - collector
       - logging-loki-compactor
       - logging-loki-distributor
-      #- logging-loki-gateway
+      - logging-loki-gateway
       - logging-loki-index-gateway
       - logging-loki-ingester
       - logging-loki-querier
       - logging-loki-query-frontend
-      - collector
+      - logging-view-plugin
 
   ### see JIRA LOG-5431 if pods not running
   tasks:
-    - name: "Verify Pods running"
+    - name: "Verify Pods running" 
       ansible.builtin.import_role:
         name: common
 
+
 - name: "Verify logging pods are running in minio-dev"
   hosts: controller
   gather_facts: no
   ignore_errors: true
   environment:
     KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
     PATH: "{{ cifmw_path }}"
+
+
   vars:
     common_pod_test_id: "RHOSO-12674"
     common_pod_status_str: "Running"
     common_pod_nspace: minio-dev
     common_pod_list:
       - minio
+
   tasks:
     - name: "Run pod running tests"
       ansible.builtin.import_role:
@@ -146,27 +188,46 @@
     common_pod_nspace: openstack
     common_pod_status_str: "Completed"
     common_pod_list:
-      - logging-edpm-deployment-openstack-edpm-ipam
+      - 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:
         name: common
 
-- name: "Verify the crds exist"
+
+- name: "Verify logging services are running in openstack"
   hosts: controller
   gather_facts: no
   ignore_errors: true
   environment:
     KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
     PATH: "{{ cifmw_path }}"
   vars:
-    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
+    common_service_test_id: "RHOSO-12749"
+    common_service_nspace: openstack
+    common_service_list:
+      - nova-internal
+      - nova-metadata-internal
+      - nova-novncproxy-cell1-public
+      - nova-public
   tasks:
-    - name: "Run the crds tests"
+    - name: "Run Services tests" 
       ansible.builtin.import_role:
         name: common
+