Skip to content

Commit 2de5d0e

Browse files
committed
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
1 parent f91ed69 commit 2de5d0e

File tree

3 files changed

+93
-320
lines changed

3 files changed

+93
-320
lines changed

ci/logging_tests_computes.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
88
PATH: "{{ cifmw_path }}"
99
vars:
10-
journal_test_id: "RHOSO-12681"
11-
journal_list:
10+
common_journal_test_id: "RHOSO-12681"
11+
common_journal_list:
1212
- ceilometer_agent_compute
1313
- nova_compute
1414
tasks:
@@ -24,14 +24,14 @@
2424
KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
2525
PATH: "{{ cifmw_path }}"
2626
vars:
27-
container_test_id: "RHOSO-12753"
28-
container_list:
27+
common_container_test_id: "RHOSO-12753"
28+
common_container_list:
2929
- ceilometer_agent_compute
3030
- ceilometer_agent_ipmi
3131
- node_exporter
3232

33-
file_test_id: "RHOSO-12754"
34-
file_list:
33+
common_file_test_id: "RHOSO-12754"
34+
common_file_list:
3535
- /etc/rsyslog.d/10-telemetry.conf
3636
tasks:
3737
- name: "Run file and container tests"

ci/logging_tests_controller.yml

Lines changed: 87 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,51 @@
77
KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
88
PATH: "{{ cifmw_path }}"
99
vars:
10-
common_pod_test_id: "RHOS0-12672"
11-
common_pod_status_str: "Running"
12-
common_pod_nspace: openstack-operators
13-
common_pod_list:
14-
- telemetry-operator-controller-manager
15-
- openstack-operator-controller-manager
16-
common_subscription_test_id: "RHOSO-12678"
17-
common_subscription_nspace: openshift-operators-redhat
18-
common_subscription_list:
19-
- loki-operator
2010
common_project_test_id: "RHOSO-12668"
2111
common_project_list:
2212
- openshift-openstack-infra
2313
- openshift
2414
- openstack-operators
2515
- openshift-logging
16+
common_endpoint_test_id: "RHOSO-12682"
17+
common_endpoint_list:
18+
- [nova,compute,public]
19+
- [nova,compute,internal]
20+
- [placement,placement,public]
21+
- [placement,placement,internal]
22+
- [swift,object-store,public]
23+
- [swift,object-store,internal]
24+
- [cinderv3,volumev3,public]
25+
- [cinderv3,volumev3,internal]
26+
- [barbican,key-manager,public]
27+
- [barbican,key-manager,internal]
28+
- [keystone,identity,public]
29+
- [keystone,identity,internal]
30+
- [glance,image,public]
31+
- [glance,image,internal]
32+
- [neutron,network,public]
33+
- [neutron,network,internal]
34+
35+
common_crd_test_id: "RHOSO-12670"
36+
common_crd_list:
37+
- alertingrules.loki.grafana.com
38+
- lokistacks.loki.grafana.com
39+
- recordingrules.loki.grafana.com
40+
- rulerconfigs.loki.grafana.com
41+
42+
common_node_test_id: "RHOSO-12671"
43+
common_node_list:
44+
- edpm-compute-0
45+
- edpm-compute-1
46+
- crc
47+
48+
common_pod_test_id: "RHOS0-12672"
49+
common_pod_status_str: "Running"
50+
common_pod_nspace: openstack-operators
51+
common_pod_list:
52+
- telemetry-operator-controller-manager
53+
- dataplane-operator-controller-manager
54+
2655
common_service_test_id: "RHOSO-12675"
2756
common_service_nspace: openshift-logging
2857
common_service_list:
@@ -41,15 +70,22 @@
4170
- logging-loki-querier-http
4271
- logging-loki-query-frontend-grpc
4372
- logging-loki-query-frontend-http
73+
- logging-view-plugin
4474
- openstack-logging
45-
common_file_test_id: "RHOSO-12754"
46-
common_file_list:
47-
- /etc/rsyslog.d/10-telemetry.conf
75+
common_manifest_test_id: "RHOSO-12677"
76+
common_manifest_list:
77+
- "loki-operator 2"
78+
- "loki-helm-operator 1"
79+
common_subscription_test_id: "RHOSO-12678"
80+
common_subscription_nspace: openshift-operators-redhat
81+
common_subscription_list:
82+
- loki-operator
4883
tasks:
49-
- name: "Verify logging infrastructure components"
84+
- name: "Run logging project, endpoint, credential, node, pod, service, manifest and subscription tests"
5085
ansible.builtin.import_role:
5186
name: common
5287

88+
5389
- name: "Verify logging pods are running in openstack"
5490
hosts: controller
5591
gather_facts: no
@@ -82,6 +118,7 @@
82118
common_pod_nspace: openshift-operators-redhat
83119
common_pod_list:
84120
- loki-operator-controller-manager
121+
85122
tasks:
86123
- name: "Verify Pods running"
87124
ansible.builtin.import_role:
@@ -100,34 +137,39 @@
100137
common_pod_nspace: openshift-logging
101138
common_pod_list:
102139
- cluster-logging-operator
140+
- collector
103141
- logging-loki-compactor
104142
- logging-loki-distributor
105-
#- logging-loki-gateway
143+
- logging-loki-gateway
106144
- logging-loki-index-gateway
107145
- logging-loki-ingester
108146
- logging-loki-querier
109147
- logging-loki-query-frontend
110-
- collector
148+
- logging-view-plugin
111149

112150
### see JIRA LOG-5431 if pods not running
113151
tasks:
114-
- name: "Verify Pods running"
152+
- name: "Verify Pods running"
115153
ansible.builtin.import_role:
116154
name: common
117155

156+
118157
- name: "Verify logging pods are running in minio-dev"
119158
hosts: controller
120159
gather_facts: no
121160
ignore_errors: true
122161
environment:
123162
KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
124163
PATH: "{{ cifmw_path }}"
164+
165+
125166
vars:
126167
common_pod_test_id: "RHOSO-12674"
127168
common_pod_status_str: "Running"
128169
common_pod_nspace: minio-dev
129170
common_pod_list:
130171
- minio
172+
131173
tasks:
132174
- name: "Run pod running tests"
133175
ansible.builtin.import_role:
@@ -146,27 +188,46 @@
146188
common_pod_nspace: openstack
147189
common_pod_status_str: "Completed"
148190
common_pod_list:
149-
- logging-edpm-deployment-openstack-edpm-ipam
191+
- bootstrap-edpm-deployment-logging
192+
- configure-network-edpm-deployment-logging
193+
- configure-os-edpm-deployment-logging
194+
- download-cache-edpm-deployment-logging
195+
- install-certs-edpm-deployment-logging
196+
- install-os-edpm-deployment-logging
197+
- libvirt-edpm-deployment-logging
198+
- logging-edpm-deployment-logging-openstack-edpm
199+
- neutron-metadata-edpm-deployment-logging
200+
- nova-custom-edpm-deployment
201+
- ovn-edpm-deployment-logging
202+
- reboot-os-edpm-deployment-logging
203+
- repo-setup-edpm-deployment-logging
204+
- run-os-edpm-deployment-logging
205+
- ssh-known-hosts-edpm-deployment-logging
206+
- telemetry-edpm-deployment-logging
207+
- validate-network-edpm-deployment-logging
150208
tasks:
151209
- name: "Run pods completed tests"
152210
ansible.builtin.import_role:
153211
name: common
154212

155-
- name: "Verify the crds exist"
213+
214+
- name: "Verify logging services are running in openstack"
156215
hosts: controller
157216
gather_facts: no
158217
ignore_errors: true
159218
environment:
160219
KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
161220
PATH: "{{ cifmw_path }}"
162221
vars:
163-
common_crd_test_id: "RHOSO-12670"
164-
common_crd_list:
165-
- alertingrules.loki.grafana.com
166-
- lokistacks.loki.grafana.com
167-
- recordingrules.loki.grafana.com
168-
- rulerconfigs.loki.grafana.com
222+
common_service_test_id: "RHOSO-12749"
223+
common_service_nspace: openstack
224+
common_service_list:
225+
- nova-internal
226+
- nova-metadata-internal
227+
- nova-novncproxy-cell1-public
228+
- nova-public
169229
tasks:
170-
- name: "Run the crds tests"
230+
- name: "Run Services tests"
171231
ansible.builtin.import_role:
172232
name: common
233+

0 commit comments

Comments
 (0)