[RHELC-1193] Identify highest status in json report #983

pr-watson · 2023-11-15T21:18:45Z

This PR adds a function find_highest_report_level to report.py to get the highest status level within the results and messages reported in the analysis. This highest status level is added as a new key to the report json at the top level for use in the rhc worker script.

Jira Issues: RHELC-1193

Checklist

PR has been tested manually in a VM (either author or reviewer)
Jira issue has been made public if possible
[RHELC-] is part of the PR title
GitHub label has been added to help with Release notes
PR title explains the change from the user's point of view
Code and tests are documented properly
The commits are squashed to as few commits as possible (without losing data)
When merged: Jira issue has been updated to Release Pending if relevant

has-bot · 2023-11-15T21:18:58Z

/packit test

@oamg/conversions-qe please review results and provide ack.

Log | Bot Usage

codecov · 2023-11-15T21:20:32Z

Codecov Report

Attention: 2 lines in your changes are missing coverage. Please review.

Comparison is base (6b38b7b) 94.20% compared to head (6d280fe) 94.18%.
Report is 1 commits behind head on main.

Files	Patch %	Lines
...t2rhel/actions/pre_ponr_changes/handle_packages.py	50.00%	0 Missing and 2 partials ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #983      +/-   ##
==========================================
- Coverage   94.20%   94.18%   -0.03%     
==========================================
  Files          47       47              
  Lines        4368     4383      +15     
  Branches      774      779       +5     
==========================================
+ Hits         4115     4128      +13     
  Misses        177      177              
- Partials       76       78       +2

Flag	Coverage Δ
centos-linux-7	`89.15% <86.66%> (-0.01%)`	⬇️
centos-linux-8	`90.21% <86.66%> (-0.02%)`	⬇️
centos-linux-9	`90.27% <86.66%> (-0.02%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

convert2rhel/actions/report.py

hosekadam · 2023-11-16T14:53:00Z

convert2rhel/unit_tests/actions/report_test.py

+    assert result == expected
+
+
+def test_find_highest_report_level_unknown_status():


Maybe I would use the pytest.mark.parametrize for easier addition of new cases. But question is if that would be ever needed.

Likely won't have new cases. Just having FOO as an unknown status satisfies checking that unknown statuses will not be added to our output

agreed with @pr-watson. Can't see a case where we would need to parametrize this.

pr-watson · 2023-11-17T18:32:34Z

/packit retest-failed

schemas/assessment-schema-1.1.json

Venefilyn · 2023-11-24T13:48:42Z

schemas/assessment-schema-1.1.json

@@ -0,0 +1,150 @@
+{
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "$id": "https://raw.githubusercontent.com/oamg/convert2rhel/main/schemas/assessment-schema-1.0.json",


Suggested change

"$id": "https://raw.githubusercontent.com/oamg/convert2rhel/main/schemas/assessment-schema-1.0.json",

"$id": "https://raw.githubusercontent.com/oamg/convert2rhel/main/schemas/assessment-schema-1.1.json",

schemas/assessment-schema-1.1.json

Venefilyn · 2023-11-24T14:01:23Z

convert2rhel/actions/report.py

    # Use an envelope so we can add other, non-result info if necessary.
    envelope = {
-        "format_version": "1.0",
+        "format_version": "1.1",


Why do we add the format_version here and not using the one in the schema file?

r0x0d · 2023-11-27T18:09:34Z

convert2rhel/actions/report.py

+    they come.
+    """


Please, if you can, update the docstring to include the param/type/return/rtype.

Suggested change

they come.

"""

they come.

:param results: ...

:type results: ...

:return: ...

:rtype: ...

"""

r0x0d · 2023-11-27T18:17:32Z

schemas/assessment-schema-1.1.json

+            "const": "1.0"
+        },
+        "status": {
+            "description": "The highest severity of all actions.",


Maybe not necessary, but I would include "between messages and results" in this description

r0x0d

It looks good to me. Just left a couple of questions and I think one of @SpyTec comments is necessary to apply. Not approving it yet, but I can see the PR is correct.

pr-watson · 2023-11-27T19:21:26Z

@r0x0d just added the requested suggestions, ready for another round of review

pr-watson · 2023-11-28T14:39:49Z

/packit test

Venefilyn · 2023-11-28T14:55:15Z

/packit build

pr-watson · 2023-11-28T14:55:26Z

/packit retest-failed

Venefilyn · 2023-11-28T16:16:42Z

/packit test

pr-watson · 2023-11-29T14:17:12Z

/packit test

has-bot · 2023-11-30T16:12:45Z

/packit test --labels sanity

@oamg/conversions-qe please review results and provide ack.

Log | Bot Usage

pr-watson · 2023-12-04T15:26:59Z

/packit test --labels sanity

pr-watson · 2023-12-04T17:13:02Z

/packit test --labels sanity

pr-watson · 2023-12-05T14:17:54Z

/packit test --labels sanity

pr-watson added kind/feature New feature or request tests/all Run the full test suite. Equivalent to `/packit test`. labels Nov 15, 2023

hosekadam reviewed Nov 16, 2023

View reviewed changes

convert2rhel/actions/report.py Outdated Show resolved Hide resolved

hosekadam reviewed Nov 16, 2023

View reviewed changes

convert2rhel/actions/report.py Show resolved Hide resolved

hosekadam reviewed Nov 16, 2023

View reviewed changes

pr-watson force-pushed the highest-status branch 2 times, most recently from ffa4686 to 9874d35 Compare November 16, 2023 20:27

hosekadam reviewed Nov 20, 2023

View reviewed changes

schemas/assessment-schema-1.1.json Outdated Show resolved Hide resolved

Venefilyn changed the title ~~[RHELC-1193] Idenitify highest status in json report~~ [RHELC-1193] Identify highest status in json report Nov 24, 2023

Venefilyn reviewed Nov 24, 2023

View reviewed changes

pr-watson force-pushed the highest-status branch from 55823f0 to 64f73d6 Compare November 27, 2023 15:16

r0x0d reviewed Nov 27, 2023

View reviewed changes

pr-watson force-pushed the highest-status branch from 64f73d6 to f4c9bff Compare November 27, 2023 20:15

Venefilyn approved these changes Nov 28, 2023

View reviewed changes

pr-watson added tests/sanity PR ready to run the sanity test suit. Equivalent to `/packit test --labels sanity`. and removed tests/all Run the full test suite. Equivalent to `/packit test`. labels Nov 30, 2023

[RHELC-1193] Idenitify highest status in json report

6d280fe

pr-watson force-pushed the highest-status branch from f4c9bff to 6d280fe Compare December 5, 2023 14:16

pr-watson merged commit 6887c88 into oamg:main Dec 5, 2023
15 of 46 checks passed

pr-watson mentioned this pull request Dec 8, 2023

Bump to version 1.6.0 #1008

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[RHELC-1193] Identify highest status in json report #983

[RHELC-1193] Identify highest status in json report #983

pr-watson commented Nov 15, 2023

has-bot commented Nov 15, 2023

codecov bot commented Nov 15, 2023 •

edited

Loading

hosekadam Nov 16, 2023

pr-watson Nov 16, 2023

r0x0d Nov 27, 2023

pr-watson commented Nov 17, 2023 •

edited

Loading

Venefilyn Nov 24, 2023

Venefilyn Nov 24, 2023

r0x0d Nov 27, 2023

r0x0d Nov 27, 2023

r0x0d left a comment

pr-watson commented Nov 27, 2023

pr-watson commented Nov 28, 2023

Venefilyn commented Nov 28, 2023

pr-watson commented Nov 28, 2023

Venefilyn commented Nov 28, 2023

pr-watson commented Nov 29, 2023

has-bot commented Nov 30, 2023

pr-watson commented Dec 4, 2023

pr-watson commented Dec 4, 2023

pr-watson commented Dec 5, 2023

		assert result == expected


		def test_find_highest_report_level_unknown_status():

	"$id": "https://raw.githubusercontent.com/oamg/convert2rhel/main/schemas/assessment-schema-1.0.json",
	"$id": "https://raw.githubusercontent.com/oamg/convert2rhel/main/schemas/assessment-schema-1.1.json",

-    they come.
-    """
+    they come.
+    :param results: ...
+    :type results: ...
+    :return: ...
+    :rtype: ...
+    """

[RHELC-1193] Identify highest status in json report #983

[RHELC-1193] Identify highest status in json report #983

Conversation

pr-watson commented Nov 15, 2023

has-bot commented Nov 15, 2023

codecov bot commented Nov 15, 2023 • edited Loading

Codecov Report

hosekadam Nov 16, 2023

Choose a reason for hiding this comment

pr-watson Nov 16, 2023

Choose a reason for hiding this comment

r0x0d Nov 27, 2023

Choose a reason for hiding this comment

pr-watson commented Nov 17, 2023 • edited Loading

Venefilyn Nov 24, 2023

Choose a reason for hiding this comment

Venefilyn Nov 24, 2023

Choose a reason for hiding this comment

r0x0d Nov 27, 2023

Choose a reason for hiding this comment

r0x0d Nov 27, 2023

Choose a reason for hiding this comment

r0x0d left a comment

Choose a reason for hiding this comment

pr-watson commented Nov 27, 2023

pr-watson commented Nov 28, 2023

Venefilyn commented Nov 28, 2023

pr-watson commented Nov 28, 2023

Venefilyn commented Nov 28, 2023

pr-watson commented Nov 29, 2023

has-bot commented Nov 30, 2023

pr-watson commented Dec 4, 2023

pr-watson commented Dec 4, 2023

pr-watson commented Dec 5, 2023

codecov bot commented Nov 15, 2023 •

edited

Loading

pr-watson commented Nov 17, 2023 •

edited

Loading