Skip to content

Commit 07cd96c

Browse files
elfiesmelfieelfiesmelfie
committed
[ci] Update the logging tests to use new pod test config format
1 parent d839072 commit 07cd96c

File tree

2 files changed

+139
-67
lines changed

2 files changed

+139
-67
lines changed

‎ci/logging_tests_controller.yml‎

Lines changed: 136 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -86,29 +86,32 @@
8686
common_pod_nspace: openstack
8787
common_pod_list:
8888
- openstackclient
89+
- name: loki-operator-controller-manager
90+
nspace: openshift-operators-redhat
91+
test_id: "RHOSO-12673"
8992
tasks:
9093
- name: "Verify Running Pods"
9194
ansible.builtin.import_role:
9295
name: common
9396

9497

95-
- name: "Verify logging pods are running in openshift-operators-redhat"
96-
hosts: controller
97-
gather_facts: no
98-
ignore_errors: true
99-
environment:
100-
KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
101-
PATH: "{{ cifmw_path }}"
102-
vars:
103-
common_pod_test_id: "RHOSO-12673"
104-
common_pod_status_str: "Running"
105-
common_pod_nspace: openshift-operators-redhat
106-
common_pod_list:
107-
- loki-operator-controller-manager
108-
tasks:
109-
- name: "Verify Pods running"
110-
ansible.builtin.import_role:
111-
name: common
98+
#- name: "Verify logging pods are running in openshift-operators-redhat"
99+
# hosts: controller
100+
# gather_facts: no
101+
# ignore_errors: true
102+
# environment:
103+
# KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
104+
# PATH: "{{ cifmw_path }}"
105+
# vars:
106+
# common_pod_test_id: "RHOSO-12673"
107+
# common_pod_status_str: "Running"
108+
# common_pod_nspace: openshift-operators-redhat
109+
# common_pod_list:
110+
# - loki-operator-controller-manager
111+
# tasks:
112+
# - name: "Verify Pods running"
113+
# ansible.builtin.import_role:
114+
# name: common
112115

113116
- name: "Verify logging pods are running in openshift-logging"
114117
hosts: controller
@@ -131,64 +134,131 @@
131134
- logging-loki-querier
132135
- logging-loki-query-frontend
133136
- collector
137+
- name: minio
138+
nspace: minio-dev
139+
test_id: "RHOSO-12674"
140+
- name: bootstrap-edpm-deployment-openstack-edpm-ipam
141+
nspace: openstack
142+
status_str: "Completed"
143+
test_id: "RHOSO-12679"
144+
- name: configure-network-edpm-deployment-openstack-edpm-ipam
145+
nspace: openstack
146+
status_str: "Completed"
147+
test_id: "RHOSO-12679"
148+
- name: configure-os-edpm-deployment-openstack-edpm-ipam
149+
nspace: openstack
150+
status_str: "Completed"
151+
test_id: "RHOSO-12679"
152+
- name: download-cache-edpm-deployment-openstack-edpm-ipam
153+
nspace: openstack
154+
status_str: "Completed"
155+
test_id: "RHOSO-12679"
156+
- name: install-certs-edpm-deployment-openstack-edpm-ipam
157+
nspace: openstack
158+
status_str: "Completed"
159+
test_id: "RHOSO-12679"
160+
- name: install-os-edpm-deployment-openstack-edpm-ipam
161+
nspace: openstack
162+
status_str: "Completed"
163+
test_id: "RHOSO-12679"
164+
- name: libvirt-edpm-deployment-openstack-edpm-ipam
165+
nspace: openstack
166+
status_str: "Completed"
167+
test_id: "RHOSO-12679"
168+
- name: logging-edpm-deployment-openstack-edpm-ipam
169+
nspace: openstack
170+
status_str: "Completed"
171+
test_id: "RHOSO-12679"
172+
- name: neutron-metadata-edpm-deployment-openstack-edpm-ipam
173+
nspace: openstack
174+
status_str: "Completed"
175+
test_id: "RHOSO-12679"
176+
- name: nova-edpm-deployment-openstack-edpm-ipam
177+
nspace: openstack
178+
status_str: "Completed"
179+
test_id: "RHOSO-12679"
180+
- name: ovn-edpm-deployment-openstack-edpm-ipam
181+
nspace: openstack
182+
status_str: "Completed"
183+
test_id: "RHOSO-12679"
184+
- name: reboot-os-edpm-deployment-openstack-edpm-ipam
185+
nspace: openstack
186+
status_str: "Completed"
187+
test_id: "RHOSO-12679"
188+
- name: run-os-edpm-deployment-openstack-edpm-ipam
189+
nspace: openstack
190+
status_str: "Completed"
191+
test_id: "RHOSO-12679"
192+
- name: ssh-known-hosts-edpm-deployment
193+
nspace: openstack
194+
status_str: "Completed"
195+
test_id: "RHOSO-12679"
196+
- name: telemetry-edpm-deployment-openstack-edpm-ipam
197+
nspace: openstack
198+
status_str: "Completed"
199+
test_id: "RHOSO-12679"
200+
- name: validate-network-edpm-deployment-openstack-edpm-ipam
201+
nspace: openstack
202+
status_str: "Completed"
203+
test_id: "RHOSO-12679"
134204

135205
### see JIRA LOG-5431 if pods not running
136206
tasks:
137207
- name: "Verify Pods running"
138208
ansible.builtin.import_role:
139209
name: common
140210

141-
- name: "Verify logging pods are running in minio-dev"
142-
hosts: controller
143-
gather_facts: no
144-
ignore_errors: true
145-
environment:
146-
KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
147-
PATH: "{{ cifmw_path }}"
148-
vars:
149-
common_pod_test_id: "RHOSO-12674"
150-
common_pod_status_str: "Running"
151-
common_pod_nspace: minio-dev
152-
common_pod_list:
153-
- minio
154-
tasks:
155-
- name: "Run pod running tests"
156-
ansible.builtin.import_role:
157-
name: common
211+
#- name: "Verify logging pods are running in minio-dev"
212+
# hosts: controller
213+
# gather_facts: no
214+
# ignore_errors: true
215+
# environment:
216+
# KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
217+
# PATH: "{{ cifmw_path }}"
218+
# vars:
219+
# common_pod_test_id: "RHOSO-12674"
220+
# common_pod_status_str: "Running"
221+
# common_pod_nspace: minio-dev
222+
# common_pod_list:
223+
# - minio
224+
# tasks:
225+
# - name: "Run pod running tests"
226+
# ansible.builtin.import_role:
227+
# name: common
158228

159229

160-
- name: "Verify logging pods have complete status in openstack"
161-
hosts: controller
162-
gather_facts: no
163-
ignore_errors: true
164-
environment:
165-
KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
166-
PATH: "{{ cifmw_path }}"
167-
vars:
168-
common_pod_test_id: "RHOSO-12679"
169-
common_pod_nspace: openstack
170-
common_pod_status_str: "Completed"
171-
common_pod_list:
172-
- bootstrap-edpm-deployment-openstack-edpm-ipam
173-
- configure-network-edpm-deployment-openstack-edpm-ipam
174-
- configure-os-edpm-deployment-openstack-edpm-ipam
175-
- download-cache-edpm-deployment-openstack-edpm-ipam
176-
- install-certs-edpm-deployment-openstack-edpm-ipam
177-
- install-os-edpm-deployment-openstack-edpm-ipam
178-
- libvirt-edpm-deployment-openstack-edpm-ipam
179-
- logging-edpm-deployment-openstack-edpm-ipam
180-
- neutron-metadata-edpm-deployment-openstack-edpm-ipam
181-
- nova-edpm-deployment-openstack-edpm-ipam
182-
- ovn-edpm-deployment-openstack-edpm-ipam
183-
- reboot-os-edpm-deployment-openstack-edpm-ipam
184-
- run-os-edpm-deployment-openstack-edpm-ipam
185-
- ssh-known-hosts-edpm-deployment
186-
- telemetry-edpm-deployment-openstack-edpm-ipam
187-
- validate-network-edpm-deployment-openstack-edpm-ipam
188-
tasks:
189-
- name: "Run pods completed tests"
190-
ansible.builtin.import_role:
191-
name: common
230+
#- name: "Verify logging pods have complete status in openstack"
231+
# hosts: controller
232+
# gather_facts: no
233+
# ignore_errors: true
234+
# environment:
235+
# KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
236+
# PATH: "{{ cifmw_path }}"
237+
# vars:
238+
# common_pod_test_id: "RHOSO-12679"
239+
# common_pod_nspace: openstack
240+
# common_pod_status_str: "Completed"
241+
# common_pod_list:
242+
# - name: bootstrap-edpm-deployment-openstack-edpm-ipam
243+
# - name: configure-network-edpm-deployment-openstack-edpm-ipam
244+
# - name: configure-os-edpm-deployment-openstack-edpm-ipam
245+
# - name: download-cache-edpm-deployment-openstack-edpm-ipam
246+
# - name: install-certs-edpm-deployment-openstack-edpm-ipam
247+
# - name: install-os-edpm-deployment-openstack-edpm-ipam
248+
# - name: libvirt-edpm-deployment-openstack-edpm-ipam
249+
# - name: logging-edpm-deployment-openstack-edpm-ipam
250+
# - name: neutron-metadata-edpm-deployment-openstack-edpm-ipam
251+
# - name: nova-edpm-deployment-openstack-edpm-ipam
252+
# - name: ovn-edpm-deployment-openstack-edpm-ipam
253+
# - name: reboot-os-edpm-deployment-openstack-edpm-ipam
254+
# - name: run-os-edpm-deployment-openstack-edpm-ipam
255+
# - name: ssh-known-hosts-edpm-deployment
256+
# - name: telemetry-edpm-deployment-openstack-edpm-ipam
257+
# - name: validate-network-edpm-deployment-openstack-edpm-ipam
258+
# tasks:
259+
# - name: "Run pods completed tests"
260+
# ansible.builtin.import_role:
261+
# name: common
192262

193263
- name: "Verify the crds exist"
194264
hosts: controller

‎roles/common/tasks/pod_tests.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
status_str: "{{ item.status_str if \"status_str\" in item else common_pod_status_str }}"
88
test_id: "{{ item.test_id if \"test_id\" in item else common_pod_test_id | default(omit) }}"
99

10-
- debug: var=pod
10+
- name: Show the pod details for this test
11+
ansible.builtin.debug:
12+
var: pod
1113

1214
- block:
1315
# expects that one line will be returned

0 commit comments

Comments
 (0)