Skip to content

Commit 3e3ae80

Browse files
committed
Rename tasks to have test id and description
The tasks were previously renamed to just be the test id, due to limitations in the custom_logger callbaack plugin. This was addressed, and the test_report_result reports in the correct format now, so the names can be reverted. This makes reports more grokable, since the summary_result.log contains a list of the passed/failed tests with the task names.
1 parent e7ee198 commit 3e3ae80

File tree

11 files changed

+50
-100
lines changed

11 files changed

+50
-100
lines changed

roles/client_side_tests/tasks/test_e2e.yml

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
ansible.builtin.include_tasks:
44
file: get_prom_info.yml
55

6-
- name: RHELOSP-37759
7-
# Description: Query Prometheus for collectd_cpu_percent metrics and save the output into the file
6+
- name: RHELOSP-37759 Query Prometheus for collectd_cpu_percent metrics and save the output into the file
87
ansible.builtin.shell:
98
cmd: >-
109
/usr/bin/curl -k {{ prom_auth_string }} \
@@ -16,8 +15,7 @@
1615
failed_when:
1716
- checkmyconf.rc !=0
1817

19-
- name: RHELOSP-57528
20-
# Description: Query Prometheus for ceph_ceph_bytes metrics and save the output into the file
18+
- name: RHELOSP-57528 Query Prometheus for ceph_ceph_bytes metrics and save the output into the file
2119
ansible.builtin.shell:
2220
cmd: >-
2321
/usr/bin/curl -k {{ prom_auth_string }} \
@@ -29,8 +27,7 @@
2927
failed_when:
3028
- checkmyconf.rc !=0
3129

32-
- name: RHELOSP-57536
33-
# Description: Query Prometheus for collectd_interface_if_packets_tx_total metrics and save the output into the file
30+
- name: RHELOSP-57536 Query Prometheus for collectd_interface_if_packets_tx_total metrics and save the output into the file
3431
ansible.builtin.shell:
3532
cmd: >-
3633
/usr/bin/curl -k {{ prom_auth_string }} \
@@ -42,8 +39,7 @@
4239
failed_when:
4340
- checkmyconf.rc !=0
4441

45-
- name: RHELOSP-37762
46-
# Description: Query Prometheus for collectd_memory metrics and save the output into the file
42+
- name: RHELOSP-37762 Query Prometheus for collectd_memory metrics and save the output into the file
4743
ansible.builtin.shell:
4844
cmd: >-
4945
/usr/bin/curl -k {{ prom_auth_string }} \
@@ -55,8 +51,7 @@
5551
failed_when:
5652
- checkmyconf.rc !=0
5753

58-
- name: RHELOSP-117539
59-
# Description: Query Prometheus for collectd_load_longterm metrics and save the output into the file
54+
- name: RHELOSP-117539 Query Prometheus for collectd_load_longterm metrics and save the output into the file
6055
ansible.builtin.shell:
6156
cmd: >-
6257
/usr/bin/curl -k {{ prom_auth_string }} \
@@ -68,8 +63,7 @@
6863
failed_when:
6964
- checkmyconf.rc !=0
7065

71-
- name: RHELOSP-37757
72-
# Description: Read content of query_ceph_ceph_bytes file and check that metrics are present
66+
- name: RHELOSP-37757 Read content of query_ceph_ceph_bytes file and check that metrics are present
7367
ansible.builtin.command:
7468
cmd: >-
7569
egrep 'ceph' /tmp/query_ceph_ceph_bytes
@@ -78,8 +72,7 @@
7872
failed_when:
7973
- checkmyconf.rc != 0
8074

81-
- name: RHELOSP-37218
82-
# Description: Read content of query_collectd_interface_tx_total file and check that metrics are present
75+
- name: RHELOSP-37218 Read content of query_collectd_interface_tx_total file and check that metrics are present
8376
ansible.builtin.shell:
8477
cmd: >-
8578
egrep 'controller-0|controller-1|controller-2|compute-0|compute-1|ceph-0' /tmp/query_collectd_interface_tx_total
@@ -88,8 +81,7 @@
8881
failed_when:
8982
- checkmyconf.rc != 0
9083

91-
- name: RHELOSP-37636
92-
# Description: Read contents of query_collectd_cpu_percent file and check that metrics are present
84+
- name: RHELOSP-37636 Read contents of query_collectd_cpu_percent file and check that metrics are present
9385
ansible.builtin.shell:
9486
cmd: >-
9587
egrep 'controller-0|controller-1|controller-2|compute-0|compute-1|ceph-0' /tmp/query_collectd_cpu_percent
@@ -99,8 +91,7 @@
9991
- checkmyconf.rc != 0
10092

10193

102-
- name: RHELOSP-37670
103-
# Description: Read content of query_collectd_memory file and check that metrics are present
94+
- name: RHELOSP-37670 Read content of query_collectd_memory file and check that metrics are present
10495
ansible.builtin.shell:
10596
cmd: >-
10697
egrep 'controller-0|controller-1|controller-2|compute-0|compute-1|ceph-0' /tmp/query_collectd_memory
@@ -110,8 +101,7 @@
110101
- checkmyconf.rc != 0
111102

112103

113-
- name: RHELOSP-37224
114-
# Description: Read contents of query_load_longterm file and check that metrics are present
104+
- name: RHELOSP-37224 Read contents of query_load_longterm file and check that metrics are present
115105
ansible.builtin.shell:
116106
cmd: >-
117107
egrep 'controller-0|controller-1|controller-2|compute-0|compute-1|ceph-0' /tmp/query_load_longterm

roles/test_alerts/tasks/test_create_an_alert.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
# Assuming we're in the right project already...
44
# Following procedure on https://infrawatch.github.io/documentation/#creating-an-alert-rule-in-prometheus_assembly-advanced-features
55

6-
- name: "RHELOSP-144965"
7-
# description: Create the alert
6+
- name: "RHELOSP-144965 Create the alert"
87
ansible.builtin.shell:
98
cmd: |
109
oc apply -f - <<EOF
@@ -28,8 +27,7 @@
2827
register: cmd_output
2928
failed_when: cmd_output.rc != 0
3029

31-
- name: "RHELOSP-144480"
32-
# description: Check that the alert was created
30+
- name: "RHELOSP-144480 Check that the alert was created"
3331
ansible.builtin.command:
3432
cmd: |
3533
curl -k {{ prom_auth_string }} https://{{ prom_url }}/api/v1/rules

roles/test_alerts/tasks/test_creating_a_standard_alert_route_in_alert_manager.yml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33

44
# Pre-check: is the value of global.timeout = 5m in the alertmanager secret
55
# TODO: put the patch into a file. and use --patch-file instead of -p OR slurp the file from files/
6-
- name: "RHELOSP-144965"
7-
# description: "Patch the ServiceTelemetry object for the STF deployment"
6+
- name: "RHELOSP-144965 Patch the ServiceTelemetry object for the STF deployment"
87
ansible.builtin.shell:
98
cmd: |
109
oc patch stf default --type merge -p '{"spec": {"alertmanagerConfigManifest": "apiVersion: v1\nkind: Secret\nmetadata:\n name: 'alertmanager-default'\n namespace: 'service-telemetry'\ntype: Opaque\nstringData:\n alertmanager.yaml: |-\n global:\n resolve_timeout: 10m\n route:\n group_by: ['job']\n group_wait: 30s\n group_interval: 5m\n repeat_interval: 12h\n receiver: 'null'\n receivers:\n - name: 'null'\n"}}'
@@ -34,16 +33,14 @@
3433
ansible.builtin.debug:
3534
var: alertmanager_secret
3635

37-
- name: "RHELOSP-148697"
38-
# description: Interrupt metrics flow by preventing the QDR from running
36+
- name: "RHELOSP-148697 Interrupt metrics flow by preventing the QDR from running"
3937
ansible.builtin.shell:
4038
cmd: |
4139
for i in {1..15}; do oc delete po -l application=default-interconnect; sleep 1; done
4240
changed_when: false
4341

4442

45-
- name: "RHELOSP-148698"
46-
# description: Verify that the alert is active in Alertmanager
43+
- name: "RHELOSP-148698 Verify that the alert is active in Alertmanager"
4744
ansible.builtin.shell:
4845
cmd: >-
4946
oc exec -it prometheus-default-0 -c prometheus -- /bin/sh -c 'wget --header \
@@ -53,8 +50,7 @@
5350
changed_when: false
5451
failed_when: cmd_output.stdout|int == 0
5552

56-
- name: "RHELOSP-148699"
57-
# description: "Verify that the alert is firing in Prometheus"
53+
- name: "RHELOSP-148699 Verify that the alert is firing in Prometheus"
5854
ansible.builtin.shell:
5955
cmd: >-
6056
/usr/bin/curl -k {{ prom_auth_string }} -g https://{{ prom_url }}/api/v1/alerts | grep 'firing' | grep 'Collectd metrics receive rate is zero' | wc -l
@@ -68,8 +64,7 @@
6864
minutes: 2
6965

7066

71-
- name: "RHELOSP-176039"
72-
# Remove alertmanagerConfigManifest from the ServiceTelemetry object
67+
- name: "RHELOSP-176039 Remove alertmanagerConfigManifest from the ServiceTelemetry object"
7368
ansible.builtin.shell:
7469
cmd: |
7570
oc patch stf/default --type='json' -p '[{"op": "remove", "path": "/spec/alertmanagerConfigManifest"}]'

roles/test_collectd/tasks/main.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
---
2-
- name: RHELOSP-60406
3-
# Description: Check whether collectd container is running
2+
- name: RHELOSP-60406 Check whether collectd container is running
43
ansible.builtin.shell: |
54
set -o pipefail
65
{{ container_bin }} ps | grep {{ collectd_container_name }}
76
register: container_nodes
87
changed_when: false
98
failed_when: container_nodes.stdout_lines|length != 1
109

11-
- name: RHELOSP-60411
12-
# Description: Check for a non-zero number of metrics from collectd
10+
- name: RHELOSP-60411 Check for a non-zero number of metrics from collectd
1311
ansible.builtin.command: |
1412
{{ container_bin }} exec {{ collectd_container_name }} collectdctl -s /var/run/collectd-socket listval
1513
register: metrics
@@ -24,8 +22,7 @@
2422
ansible.builtin.debug:
2523
var: metrics.stdout_lines[-20]
2624

27-
- name: RHELOSP-69331
28-
# Description: Get the value of some metric from collectd
25+
- name: RHELOSP-69331 Get the value of some metric from collectd
2926
ansible.builtin.command: |
3027
{{ container_bin }} exec {{ collectd_container_name }} collectdctl -s /var/run/collectd-socket getval {{ metrics.stdout_lines[-20] }}
3128
register: stat

roles/test_metrics_retention/tasks/main.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
# Assuming we're in the right project already...
55

66

7-
- name: "RHELOSP-144988"
8-
# description: "Set metrics retention to 17d"
7+
- name: "RHELOSP-144988 Set metrics retention to 17d"
98
ansible.builtin.shell:
109
cmd: |
1110
oc patch stf/default --type merge -p '{"spec": {"backends": {"metrics": {"prometheus": {"enabled": true, "scrapeInterval": "10s", "storage": {"retention": "17d", "strategy": "ephemeral"}}}}}}'
@@ -20,8 +19,7 @@
2019
changed_when: false
2120

2221

23-
- name: "RHELOSP-144484"
24-
# description: "Check that the retention was set"
22+
- name: "RHELOSP-144484 Check that the retention was set"
2523
ansible.builtin.shell:
2624
cmd: |
2725
oc describe pod prometheus-default-0 | grep -o 'storage.tsdb.retention.time=17d' | wc -l

roles/test_observability_strategy/tasks/main.yml

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,44 +3,39 @@
33
# Following procedure on https://infrawatch.github.io/documentation/#configuring-observability-strategy_assembly-installing-the-core-components-of-stf
44
# Assuming we're in teh right project already...
55

6-
- name: "RHELOSP-148696"
7-
# description: "Add observabilityStrategy to the STF object"
6+
- name: "RHELOSP-148696 Add observabilityStrategy to the STF object"
87
ansible.builtin.shell:
98
cmd: |
109
oc patch stf/default --type merge -p '{"spec":{"observabilityStrategy": "none"}}'
1110
changed_when: false
1211
register: cmd_output
1312
failed_when: cmd_output.rc != 0
1413

15-
- name: "RHELOSP-148700"
16-
# description: delete Grafana object
14+
- name: "RHELOSP-148700 delete Grafana object"
1715
ansible.builtin.shell:
1816
cmd: |
1917
oc delete grafana default && while oc get po -l app=grafana | grep grafana; do sleep 1; done;
2018
changed_when: false
2119
register: cmd_output
2220
failed_when: cmd_output.rc != 0
2321

24-
- name: "RHELOSP-148701"
25-
# description: "Delete Prometheus object"
22+
- name: "RHELOSP-148701 Delete Prometheus object"
2623
ansible.builtin.shell:
2724
cmd: |
2825
oc delete prometheus default && while oc get po -l app=prometheus | grep prometheus; do sleep 1; done;
2926
changed_when: false
3027
register: cmd_output
3128
failed_when: cmd_output.rc != 0
3229

33-
- name: "RHELOSP-148702"
34-
# description: "Delete Alertmanager object"
30+
- name: "RHELOSP-148702 Delete Alertmanager object"
3531
ansible.builtin.shell:
3632
cmd: |
3733
oc delete alertmanager default && while oc get po -l app=alertmanager | grep alertmanager; do sleep 1; done;
3834
changed_when: false
3935
register: cmd_output
4036
failed_when: cmd_output.rc != 0
4137

42-
- name: "RHELOSP-148703"
43-
# desription: "Delete ElasticSearch object"
38+
- name: "RHELOSP-148703 Delete ElasticSearch object"
4439
ansible.builtin.shell:
4540
cmd: |
4641
oc delete elasticsearches.elasticsearch.k8s.elastic.co elasticsearch && while oc get po | grep elasticsearch; do sleep 1; done;
@@ -52,53 +47,47 @@
5247
ansible.builtin.pause:
5348
minutes: 2
5449

55-
- name: "RHELOSP-148704"
56-
# description: "Verify that there no events SG pods"
50+
- name: "RHELOSP-148704 Verify that there no events SG pods"
5751
ansible.builtin.shell:
5852
cmd: |
5953
oc get pods | grep event| wc -l
6054
register: cmd_output
6155
failed_when: "cmd_output.stdout|int !=0"
6256
changed_when: false
6357

64-
- name: "RHELOSP-148705"
65-
# description: "Verify that Grafana pod didn't respawn"
58+
- name: "RHELOSP-148705 Verify that Grafana pod didn't respawn"
6659
ansible.builtin.shell:
6760
cmd: |
6861
oc get pods | grep grafana-deployment | wc -l
6962
register: cmd_output
7063
failed_when: "cmd_output.stdout|int !=0"
7164
changed_when: false
7265

73-
- name: "RHELOSP-148706"
74-
# description: "Verify that Prometheus pod didn't respawn"
66+
- name: "RHELOSP-148706 Verify that Prometheus pod didn't respawn"
7567
ansible.builtin.shell:
7668
cmd: |
7769
oc get pods | grep prometheus-default | wc -l
7870
register: cmd_output
7971
failed_when: "cmd_output.stdout|int !=0"
8072
changed_when: false
8173

82-
- name: "RHELOSP-148708"
83-
# description: "Verify that Alertmanager pod didn't respawn"
74+
- name: "RHELOSP-148708 Verify that Alertmanager pod didn't respawn"
8475
ansible.builtin.shell:
8576
cmd: |
8677
oc get pods | grep alertmanager-default | wc -l
8778
register: cmd_output
8879
failed_when: "cmd_output.stdout|int !=0"
8980
changed_when: false
9081

91-
- name: "RHELOSP-148709"
92-
# description: "Verify that elasticsearch pod didn't respawn"
82+
- name: "RHELOSP-148709 Verify that elasticsearch pod didn't respawn"
9383
ansible.builtin.shell:
9484
cmd: |
9585
oc get pods | grep elasticsearch | wc -l
9686
register: cmd_output
9787
failed_when: "cmd_output.stdout|int !=0"
9888
changed_when: false
9989

100-
- name: "RHELOSP-176047"
101-
# description: "Remove obesrvabilityStrategy"
90+
- name: "RHELOSP-176047 Remove obesrvabilityStrategy"
10291
ansible.builtin.shell:
10392
cmd: |
10493
oc patch stf/default --type='json' -p '[{"op": "remove", "path": "/spec/observabilityStrategy"}]'

roles/test_qdr/tasks/main.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
---
2-
- name: RHELOSP-60117
3-
# Description: Check that metrics_qdr container is running
2+
- name: RHELOSP-60117 Check that metrics_qdr container is running
43
ansible.builtin.shell: |
54
set -o pipefail
65
{{ container_bin }} ps | grep {{ qdr_container_name }}
@@ -19,8 +18,7 @@
1918
ansible.builtin.debug:
2019
var: bus_addr
2120

22-
- name: RHELOSP-60410
23-
# Description: Get number of messages received from QDR
21+
- name: RHELOSP-60410 Get number of messages received from QDR
2422
ansible.builtin.shell: |
2523
set -o pipefail
2624
{{ container_bin }} exec {{ qdr_container_name }} qdstat -b {{ bus_addr.stdout }}:5666 -g | grep "Ingress Count" | awk '{print $3}'
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
---
2-
- name: "RHELOSP-57534"
3-
# description: "Test health status"
2+
- name: "RHELOSP-57534 Test health status"
43
ansible.builtin.include_tasks:
54
file: test_health_status.yml

0 commit comments

Comments
 (0)