[RHELC-1174] Update remediation key to match leapp report metadata #949

r0x0d · 2023-10-05T17:36:07Z

The remediation key was singular in our report, and leapp one is in plural. We are matching the key in our report to remove this workaround from the pre-conversion script that is executed with the rhc-worker-script.

Jira Issues: RHELC-1174

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-10-05T17:37:29Z

/packit test --labels tier0

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

Log | Bot Usage

has-bot · 2023-10-05T17:37:35Z

/packit test --labels sanity

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

Log | Bot Usage

codecov · 2023-10-05T17:38:14Z

Codecov Report

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

Comparison is base (c24bdb6) 94.32% compared to head (0fa9277) 94.32%.
Report is 2 commits behind head on main.

❗ Current head 0fa9277 differs from pull request most recent head fbc2bf4. Consider uploading reports for the commit fbc2bf4 to get more accurate results

Files	Patch %	Lines
convert2rhel/exceptions.py	66.66%	1 Missing ⚠️

Additional details and impacted files

@@           Coverage Diff           @@
##             main     #949   +/-   ##
=======================================
  Coverage   94.32%   94.32%           
=======================================
  Files          47       47           
  Lines        4549     4549           
  Branches      810      810           
=======================================
  Hits         4291     4291           
  Misses        182      182           
  Partials       76       76

Flag	Coverage Δ
centos-linux-7	`89.50% <93.75%> (ø)`
centos-linux-8	`90.50% <93.75%> (ø)`
centos-linux-9	`90.56% <93.75%> (ø)`

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.

r0x0d · 2023-10-09T13:53:01Z

/packit test --labels sanity

With the convert2rhel PR oamg/convert2rhel#949 to update their report to use the word "remediations" instead of "remediation", we had to update our script to match the same change, but in case that there is some legacy convert2rhel running that is still in the 1.4/1.5 release, we need to take care of the "remediation" keyword. Signed-off-by: Rodolfo Olivieri <rolivier@redhat.com>

pr-watson

Changes look good to me

With the convert2rhel PR oamg/convert2rhel#949 to update their report to use the word "remediations" instead of "remediation", we had to update our script to match the same change, but in case that there is some legacy convert2rhel running that is still in the 1.4/1.5 release, we need to take care of the "remediation" keyword. Signed-off-by: Rodolfo Olivieri <rolivier@redhat.com>

convert2rhel/actions/__init__.py

Venefilyn · 2023-10-31T15:34:17Z

Needs a quick rebase, doesn't hurt to check if there are any leftover remediation= fields

r0x0d · 2023-10-31T18:13:54Z

Needs a quick rebase, doesn't hurt to check if there are any leftover remediation= fields

gotcha. doing it right now

Venefilyn

Needs another rebase due to PRs I merged today

r0x0d · 2023-11-27T13:06:03Z

Needs another rebase due to PRs I merged today

Will do it today.

r0x0d · 2023-11-29T13:02:44Z

Needs another rebase due to PRs I merged today

Will do it today.

Done the rebase, @SpyTec.

Venefilyn · 2024-01-04T14:40:31Z

/packit test --labels sanity

Venefilyn · 2024-01-05T13:56:50Z

/packit test --labels sanity

Venefilyn · 2024-01-08T15:06:15Z

Some leftovers

        [2024-01-05T09:13:29-0500] TASK - [Pre-conversion analysis report] ***********************************
        [2024-01-05T09:13:29-0500] DEBUG - /var/run/lock/convert2rhel.pid PID 1609 unlocked.
        Traceback (most recent call last):
          File "/usr/lib/python3.6/site-packages/convert2rhel/main.py", line 129, in main_locked
            disable_colors=logger_module.should_disable_color_output(),
          File "/usr/lib/python3.6/site-packages/convert2rhel/actions/report.py", line 219, in summary
            combined_results_and_message = get_combined_results_and_message(results)
          File "/usr/lib/python3.6/site-packages/convert2rhel/actions/report.py", line 135, in get_combined_results_and_message
            "remediations": action_value["result"]["remediation"],
        KeyError: 'remediation'
        
        During handling of the above exception, another exception occurred:
        
        Traceback (most recent call last):
          File "/usr/lib/python3.6/site-packages/convert2rhel/main.py", line 166, in main_locked
            return _handle_main_exceptions(process_phase, pre_conversion_results)
          File "/usr/lib/python3.6/site-packages/convert2rhel/main.py", line 195, in _handle_main_exceptions
            disable_colors=logger_module.should_disable_color_output(),
          File "/usr/lib/python3.6/site-packages/convert2rhel/actions/report.py", line 219, in summary
            combined_results_and_message = get_combined_results_and_message(results)
          File "/usr/lib/python3.6/site-packages/convert2rhel/actions/report.py", line 135, in get_combined_results_and_message
            "remediations": action_value["result"]["remediation"],
        KeyError: 'remediation'
        
        During handling of the above exception, another exception occurred:
        
        Traceback (most recent call last):
          File "/usr/bin/convert2rhel", line 11, in <module>
            load_entry_point('convert2rhel==1.6.1', 'console_scripts', 'convert2rhel')()
          File "/usr/lib/python3.6/site-packages/convert2rhel/initialize.py", line 82, in run
            return main.main()
          File "/usr/lib/python3.6/site-packages/convert2rhel/main.py", line 87, in main
            return main_locked()
          File "/usr/lib/python3.6/site-packages/convert2rhel/main.py", line 173, in main_locked
            actions.report.summary_as_txt(pre_conversion_results)
          File "/usr/lib/python3.6/site-packages/convert2rhel/actions/report.py", line 304, in summary_as_txt
            combined_results_and_message = get_combined_results_and_message(results)
          File "/usr/lib/python3.6/site-packages/convert2rhel/actions/report.py", line 135, in get_combined_results_and_message
            "remediations": action_value["result"]["remediation"],
        KeyError: 'remediation'
        FAILED

bocekm

We need a new schema version. The latest one (https://github.com/oamg/convert2rhel/blob/main/schemas/assessment-schema-1.1.json) has remediation a it needs to have remediations.

r0x0d · 2024-01-17T13:31:33Z

Will work on this as soon as possible!

The remediation key was singular in our report, and leapp one is in plural. We are matching the key in our report to remove this workaround from the pre-conversion script that is executed with the rhc-worker-script. Signed-off-by: Rodolfo Olivieri <rolivier@redhat.com> Update remediation key in actions and tests Signed-off-by: Rodolfo Olivieri <rolivier@redhat.com> Update more remediation keys Signed-off-by: Rodolfo Olivieri <rolivier@redhat.com> Update remaining remediation keys Signed-off-by: Rodolfo Olivieri <rolivier@redhat.com> Fix keys in leftover files after rebase Signed-off-by: Rodolfo Olivieri <rolivier@redhat.com>

Signed-off-by: Rodolfo Olivieri <rolivier@redhat.com>

r0x0d · 2024-01-17T18:06:23Z

/packit test --labels sanity

r0x0d · 2024-01-17T18:12:20Z

/packit test --labels sanity

schemas/assessment-schema-1.2.json

pr-watson · 2024-01-17T19:37:51Z

@r0x0d changes look good, just made one suggestion

Co-authored-by: Preston Watson <prwatson@redhat.com>

Venefilyn

Schema diff LGTM, just one change needed

92c92
<                 "remediation": {
---
>                 "remediations": {
105c105
<             "required": ["title", "description", "diagnosis", "id", "remediation", "variables"]
---
>             "required": ["title", "description", "diagnosis", "id", "remediations", "variables"]

schemas/assessment-schema-1.2.json

Co-authored-by: E Gustavsson <eric@spytec.se>

Venefilyn · 2024-01-22T16:47:34Z

/packit test --labels sanity

Venefilyn · 2024-01-22T16:48:02Z

Merging once sanity tests are green enough -- won't be for 7 or Alma 8 atm due to infra and Alma changes

Addressed

r0x0d changed the title ~~[RHELC-1174Update remediation key to match leapp report metadata~~ [RHELC-1174] Update remediation key to match leapp report metadata Oct 5, 2023

r0x0d requested a review from abadger October 5, 2023 17:36

r0x0d added the skip/changelog If it should be excluded from changelog or Release notes. Such as infra, reverted PRs, etc. label Oct 5, 2023

r0x0d mentioned this pull request Oct 9, 2023

Update remediations key to match convert2rhel output oamg/convert2rhel-insights-tasks#14

Merged

pr-watson approved these changes Oct 9, 2023

View reviewed changes

r0x0d force-pushed the update-remediation-key branch from aa2e6d5 to 621959a Compare October 17, 2023 16:48

Venefilyn reviewed Oct 19, 2023

View reviewed changes

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

r0x0d force-pushed the update-remediation-key branch from 0df33e7 to 5fdda67 Compare October 19, 2023 19:07

r0x0d force-pushed the update-remediation-key branch from 5fdda67 to 7a3ea70 Compare October 31, 2023 18:21

Venefilyn approved these changes Nov 14, 2023

View reviewed changes

r0x0d force-pushed the update-remediation-key branch from 7a3ea70 to 7d27818 Compare November 29, 2023 13:02

r0x0d requested a review from Venefilyn November 29, 2023 13:02

r0x0d force-pushed the update-remediation-key branch from 7d27818 to 75128bb Compare December 13, 2023 13:14

r0x0d requested a review from pr-watson December 13, 2023 13:24

pr-watson approved these changes Dec 13, 2023

View reviewed changes

r0x0d force-pushed the update-remediation-key branch from 75128bb to c944ae0 Compare January 3, 2024 12:32

r0x0d force-pushed the update-remediation-key branch from c944ae0 to 9f4f739 Compare January 3, 2024 12:33

bocekm previously requested changes Jan 11, 2024

View reviewed changes

r0x0d added 2 commits January 17, 2024 15:05

Add assessment schema v1.2

0fa9277

Signed-off-by: Rodolfo Olivieri <rolivier@redhat.com>

r0x0d force-pushed the update-remediation-key branch from 9f4f739 to 0fa9277 Compare January 17, 2024 18:05

r0x0d requested review from bocekm and pr-watson January 17, 2024 18:06

pr-watson reviewed Jan 17, 2024

View reviewed changes

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

Update schemas/assessment-schema-1.2.json

6458134

Co-authored-by: Preston Watson <prwatson@redhat.com>

Venefilyn requested changes Jan 22, 2024

View reviewed changes

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

Update schemas/assessment-schema-1.2.json

fbc2bf4

Co-authored-by: E Gustavsson <eric@spytec.se>

Venefilyn added kind/feature New feature or request and removed skip/changelog If it should be excluded from changelog or Release notes. Such as infra, reverted PRs, etc. labels Jan 22, 2024

Venefilyn approved these changes Jan 22, 2024

View reviewed changes

Venefilyn merged commit e67ab3c into oamg:main Jan 22, 2024
25 of 61 checks passed

Venefilyn mentioned this pull request Feb 22, 2024

Release v1.7.0 #1111

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[RHELC-1174] Update remediation key to match leapp report metadata #949

[RHELC-1174] Update remediation key to match leapp report metadata #949

r0x0d commented Oct 5, 2023 •

edited

Loading

has-bot commented Oct 5, 2023

has-bot commented Oct 5, 2023

codecov bot commented Oct 5, 2023 •

edited

Loading

r0x0d commented Oct 9, 2023

pr-watson left a comment

Venefilyn commented Oct 31, 2023

r0x0d commented Oct 31, 2023

Venefilyn left a comment

r0x0d commented Nov 27, 2023

r0x0d commented Nov 29, 2023

Venefilyn commented Jan 4, 2024

Venefilyn commented Jan 5, 2024

Venefilyn commented Jan 8, 2024

bocekm left a comment

r0x0d commented Jan 17, 2024

r0x0d commented Jan 17, 2024

r0x0d commented Jan 17, 2024

pr-watson commented Jan 17, 2024

Venefilyn left a comment •

edited

Loading

Venefilyn commented Jan 22, 2024

Venefilyn commented Jan 22, 2024

[RHELC-1174] Update remediation key to match leapp report metadata #949

[RHELC-1174] Update remediation key to match leapp report metadata #949

Conversation

r0x0d commented Oct 5, 2023 • edited Loading

has-bot commented Oct 5, 2023

has-bot commented Oct 5, 2023

codecov bot commented Oct 5, 2023 • edited Loading

Codecov Report

r0x0d commented Oct 9, 2023

pr-watson left a comment

Choose a reason for hiding this comment

Venefilyn commented Oct 31, 2023

r0x0d commented Oct 31, 2023

Venefilyn left a comment

Choose a reason for hiding this comment

r0x0d commented Nov 27, 2023

r0x0d commented Nov 29, 2023

Venefilyn commented Jan 4, 2024

Venefilyn commented Jan 5, 2024

Venefilyn commented Jan 8, 2024

bocekm left a comment

Choose a reason for hiding this comment

r0x0d commented Jan 17, 2024

r0x0d commented Jan 17, 2024

r0x0d commented Jan 17, 2024

pr-watson commented Jan 17, 2024

Venefilyn left a comment • edited Loading

Choose a reason for hiding this comment

Venefilyn commented Jan 22, 2024

Venefilyn commented Jan 22, 2024

r0x0d commented Oct 5, 2023 •

edited

Loading

codecov bot commented Oct 5, 2023 •

edited

Loading

Venefilyn left a comment •

edited

Loading