Skip to content

Commit 0442a3d

Browse files
Merge pull request #664 from vyzigold/skipped_tasks
[OSPRH-14905][d-t] fix tasks reporting as skipped
2 parents 7cc05b8 + afc3677 commit 0442a3d

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

ci/default-telemetry/tasks/no_coo_autoscaling_metricstorage.yml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,12 @@
2828
fail_msg: "telemetry-operator logs don't include expected log: {{ item }}"
2929
loop: "{{ default_telemetry_no_coo_expected_logs }}"
3030

31-
- name: Get telemetry-operator error logs
32-
ansible.builtin.set_fact:
33-
error_list: "{{ operator_logs.stdout | ansible.builtin.regex_findall('ERROR.*') }}"
34-
3531
- name: |
36-
TEST Check that telemetry-operator logs don't include unexpected errors when MetricStorage is enabled, but COO isn't installed
32+
TEST Check that telemetry-operator logs don't include errors when MetricStorage is enabled, but COO isn't installed
3733
RHOSO-123460
38-
ansible.builtin.assert:
39-
that:
40-
- item in default_telemetry_no_coo_expected_logs
41-
fail_msg: "telemetry-operator logs include an unexpected error: {{ item }}"
42-
loop: "{{ error_list }}"
34+
ansible.builtin.set_fact:
35+
error_list: "{{ operator_logs.stdout | ansible.builtin.regex_findall('ERROR.*') }}"
36+
failed_when: error_list | length != 0
4337

4438
- name: Check if we have the expected conditions for MetricStorage
4539
block:

ci/default-telemetry/tasks/test_custom_monitoring_stack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
RHOSO-123465
3838
ansible.builtin.set_fact:
3939
error_list: "{{ operator_logs.stdout | ansible.builtin.regex_findall('ERROR.*') }}"
40-
when: error_list | length != 0
40+
failed_when: error_list | length != 0
4141

4242
- name: |
4343
TEST Check Prometheus host is set correctly in the aodh-evaluator container when using a custom Prometheus

0 commit comments

Comments
 (0)