Skip to content

Commit f85682b

Browse files
devanshjainmsdevanshjainms
authored
Enhance telemetry data duration calculation and improve HTML report (#177)
1 parent b332dd6 commit f85682b

File tree

7 files changed

+63
-21
lines changed

7 files changed

+63
-21
lines changed

‎.github/workflows/codeql.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@ jobs:
4646
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
4747

4848
- name: Initialize CodeQL
49-
uses: github/codeql-action/init@fe4161a26a8629af62121b670040955b330f9af2 # v4.31.6
49+
uses: github/codeql-action/init@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
5050
with:
5151
languages: ${{ matrix.language }}
5252

5353
- name: Autobuild
54-
uses: github/codeql-action/autobuild@fe4161a26a8629af62121b670040955b330f9af2 # v4.31.6
54+
uses: github/codeql-action/autobuild@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
5555

5656
- name: Perform CodeQL Analysis
57-
uses: github/codeql-action/analyze@fe4161a26a8629af62121b670040955b330f9af2 # v4.31.6
57+
uses: github/codeql-action/analyze@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
5858
with:
5959
category: "/language:${{matrix.language}}"

‎.github/workflows/ossf-scoreboard.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,6 @@ jobs:
5252
# Upload the results to GitHub's code scanning dashboard (optional).
5353
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
5454
- name: "Upload to code-scanning"
55-
uses: github/codeql-action/upload-sarif@fe4161a26a8629af62121b670040955b330f9af2 # v4.31.6
55+
uses: github/codeql-action/upload-sarif@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
5656
with:
5757
sarif_file: results.sarif

‎.github/workflows/trivy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
output: report-fs.sarif
3737

3838
- name: Upload Trivy report (fs) GitHub Security
39-
uses: github/codeql-action/upload-sarif@fe4161a26a8629af62121b670040955b330f9af2 # v4.31.6
39+
uses: github/codeql-action/upload-sarif@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
4040
with:
4141
sarif_file: report-fs.sarif
4242
category: 'fs'

‎requirements.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# This file is autogenerated by pip-compile with Python 3.10
33
# by the following command:
44
#
5-
# pip-compile ./requirements.in
5+
# pip-compile requirements.in
66
#
77
ansible-compat==25.12.0
88
# via ansible-lint
@@ -11,7 +11,7 @@ ansible-core==2.17.14
1111
# -r requirements.in
1212
# ansible-compat
1313
# ansible-lint
14-
ansible-lint==25.12.0
14+
ansible-lint==25.12.1
1515
# via -r requirements.in
1616
ansible-runner==2.4.2
1717
# via -r requirements.in
@@ -21,7 +21,7 @@ attrs==25.4.0
2121
# via
2222
# jsonschema
2323
# referencing
24-
azure-core==1.36.0
24+
azure-core==1.37.0
2525
# via
2626
# azure-identity
2727
# azure-kusto-data
@@ -94,7 +94,7 @@ distro==1.9.0
9494
# via ansible-lint
9595
exceptiongroup==1.3.1
9696
# via pytest
97-
filelock==3.20.0
97+
filelock==3.20.1
9898
# via ansible-lint
9999
idna==3.11
100100
# via requests
@@ -239,7 +239,7 @@ rpds-py==0.30.0
239239
# via
240240
# jsonschema
241241
# referencing
242-
ruamel-yaml==0.18.16
242+
ruamel-yaml==0.18.17
243243
# via ansible-lint
244244
ruamel-yaml-clib==0.2.15
245245
# via
@@ -274,9 +274,9 @@ typing-extensions==4.15.0
274274
# cryptography
275275
# exceptiongroup
276276
# referencing
277-
tzdata==2025.2
277+
tzdata==2025.3
278278
# via pandas
279-
urllib3==2.6.1
279+
urllib3==2.6.2
280280
# via requests
281281
wcmatch==10.1
282282
# via ansible-lint

‎src/roles/ha_scs/tasks/files/constants.yaml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -392,8 +392,12 @@ RESOURCE_DEFAULTS:
392392
value: ["20", "20s"]
393393
required: false
394394
timeout:
395-
value: ["40", "40s"]
396-
required: false
395+
ANF:
396+
value: ["105", "105s"]
397+
required: false
398+
AFS:
399+
value: ["40", "40s"]
400+
required: false
397401
start:
398402
interval:
399403
value: ["0", "0s"]
@@ -710,8 +714,12 @@ RESOURCE_DEFAULTS:
710714
value: ["20", "20s"]
711715
required: false
712716
timeout:
713-
value: ["40", "40s"]
714-
required: false
717+
ANF:
718+
value: ["105", "105s"]
719+
required: false
720+
AFS:
721+
value: ["40", "40s"]
722+
required: false
715723
start:
716724
interval:
717725
value: ["0", "0s"]

‎src/roles/misc/tasks/post-telemetry-data.yml‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,24 @@
2929
"OsVersion": "{{ target_os_family | default(ansible_distribution | default('') ~ ' ' ~ ansible_distribution_version | default('')) }}",
3030
"TestCaseMessage": "{{ test_case_message | default('') }}",
3131
"TestCaseDetails": "{{ test_case_details | default('') }}",
32-
"DurationSeconds": "{{
33-
((test_execution_end_time | default(now(utc=true, fmt='%Y-%m-%d %H:%M:%S')) | to_datetime)
34-
- (test_execution_start_time | default(test_case_start_time_epoch) | to_datetime))
35-
}}",
32+
"DurationSeconds": "{{
33+
(
34+
(
35+
(test_execution_end_time
36+
| default(now(utc=true, fmt='%Y-%m-%d %H:%M:%S'))
37+
)
38+
| to_datetime('%Y-%m-%d %H:%M:%S')
39+
).timestamp()
40+
-
41+
(
42+
(test_execution_start_time
43+
| default(test_case_start_time_epoch
44+
| default(now(utc=true, fmt='%Y-%m-%d %H:%M:%S')))
45+
)
46+
| to_datetime('%Y-%m-%d %H:%M:%S')
47+
).timestamp()
48+
) | int
49+
}}",
3650
"DbFencingType": "{{ database_cluster_type if (database_high_availability | default(false)) else 'DB not HA' }}",
3751
"ScsFencingType": "{{ scs_cluster_type if (scs_high_availability | default(false)) else 'SCS not HA' }}",
3852
"StorageType": "{{ NFS_provider | default('unknown') }}",

‎src/roles/misc/tasks/render-html-report.yml‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,27 @@
2222
- name: "Read the log file and create a HTML report"
2323
render_html_report:
2424
test_group_invocation_id: "{{ test_group_invocation_id }}"
25-
test_group_name: "{{ report_file_name | default(test_group_name + '_' + ansible_os_family | upper) }}"
25+
test_group_name: "{{
26+
report_file_name
27+
| default(
28+
(
29+
(test_group_name
30+
if (test_group_name is defined)
31+
else 'TESTS')
32+
~ '_'
33+
~ (
34+
(target_os_family
35+
if (target_os_family is defined)
36+
else (
37+
(ansible_os_family
38+
if (ansible_os_family is defined)
39+
else 'UNKNOWN')
40+
))
41+
| upper
42+
)
43+
)
44+
)
45+
}}"
2646
report_template: "{{ html_report_template }}"
2747
workspace_directory: "{{ _workspace_directory }}"
2848
test_case_results: "{{ all_results | default([]) }}"

0 commit comments

Comments
 (0)