Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[RHELC-750] Rewrite the log messages using the word "unsupported" in is_loaded_kernel_latest() #684

Merged
merged 4 commits into from
Jan 24, 2024
Merged

[RHELC-750] Rewrite the log messages using the word "unsupported" in is_loaded_kernel_latest() #684

merged 4 commits into from
Jan 24, 2024

Conversation

Andrew-ang9
Copy link
Contributor

@Andrew-ang9 Andrew-ang9 commented Dec 15, 2022 •
edited
Loading

Convert2RHEL is moving away from using the word unsupported, and we will gradually go away from using this terminology. This PR also goes through the log message to better explain how the conversion can fail.

Jira Issue: RHELC-750

Checklist

  • PR meets acceptance criteria specified in the Jira issue
  • 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
  • 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

@codecov
Copy link

codecov bot commented Dec 15, 2022 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (c24bdb6) 94.32% compared to head (1904142) 94.33%.

Additional details and impacted files 
@@           Coverage Diff           @@
##             main     #684   +/-   ##
=======================================
  Coverage   94.32%   94.33%           
=======================================
  Files          47       47           
  Lines        4549     4551    +2     
  Branches      810      811    +1     
=======================================
+ Hits         4291     4293    +2     
  Misses        182      182           
  Partials       76       76
Flag Coverage Δ
centos-linux-7 89.51% <100.00%> (+<0.01%) ⬆️
centos-linux-8 90.50% <100.00%> (+<0.01%) ⬆️
centos-linux-9 90.56% <100.00%> (+<0.01%) ⬆️

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.

Venefilyn
Venefilyn reviewed Dec 22, 2022
View reviewed changes
convert2rhel/checks.py Outdated Show resolved Hide resolved
@Venefilyn Venefilyn added the kind/feature New feature or request label Dec 23, 2022
r0x0d
r0x0d reviewed Jan 2, 2023
View reviewed changes
convert2rhel/checks.py Outdated Show resolved Hide resolved
r0x0d
r0x0d reviewed Jan 2, 2023
View reviewed changes
convert2rhel/checks.py Outdated Show resolved Hide resolved
bocekm
bocekm requested changes Feb 17, 2023
View reviewed changes
convert2rhel/checks.py Outdated Show resolved Hide resolved
bocekm
bocekm requested changes Feb 20, 2023
View reviewed changes
convert2rhel/checks.py Outdated Show resolved Hide resolved
@Venefilyn Venefilyn changed the title [RHELC-750]Rewrite the log messages using the word "unsupported" in is_loaded_kernel_latest() [RHELC-750]Rewrite the log messages in is_loaded_kernel_latest() to not use "unsupported" Feb 28, 2023
@Venefilyn Venefilyn changed the title [RHELC-750]Rewrite the log messages in is_loaded_kernel_latest() to not use "unsupported" [RHELC-750] Rewrite the log messages using the word "unsupported" in is_loaded_kernel_latest() Feb 28, 2023
@danmyway danmyway force-pushed the unsupported_messages branch from 3e4485e to c5ca369 Compare May 2, 2023 10:02
danmyway
danmyway requested changes May 3, 2023
View reviewed changes
convert2rhel/checks.py Outdated Show resolved Hide resolved
convert2rhel/checks.py Outdated Show resolved Hide resolved
convert2rhel/unit_tests/checks_test.py Outdated Show resolved Hide resolved
convert2rhel/unit_tests/checks_test.py Outdated Show resolved Hide resolved
@danmyway danmyway force-pushed the unsupported_messages branch from c5ca369 to 7850393 Compare May 4, 2023 11:28
@danmyway
Copy link
Member

danmyway commented May 4, 2023

/packit test

@Venefilyn Venefilyn force-pushed the unsupported_messages branch from 7850393 to 614681f Compare May 10, 2023 15:46
@danmyway danmyway force-pushed the unsupported_messages branch from 614681f to f017da2 Compare May 11, 2023 11:35
kokesak
kokesak reviewed May 11, 2023
View reviewed changes
Copy link
Member

@kokesak kokesak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The integration tests part was reviewed. Please do not forget to fix https://github.com/oamg/convert2rhel/pull/817/files#diff-8fef26b9233077200d013e299553602a76272853b79cfd6d5693d18162f1c116R40 before merging

@Venefilyn Venefilyn force-pushed the unsupported_messages branch 2 times, most recently from f094da6 to 84176c7 Compare May 17, 2023 17:28
@Venefilyn Venefilyn force-pushed the unsupported_messages branch from 84176c7 to 5b4d65e Compare May 17, 2023 18:27
@danmyway danmyway force-pushed the unsupported_messages branch from 7f21b40 to 9de7cc6 Compare May 23, 2023 09:19
@Andrew-ang9 Andrew-ang9 force-pushed the unsupported_messages branch 2 times, most recently from 52e7dfa to 14d1e05 Compare August 16, 2023 15:35
@Andrew-ang9 Andrew-ang9 added the tests/tier0 PR ready to run the essential test suit. Equivalent to `/packit test --labels tier0`. label Aug 16, 2023
@has-bot
Copy link
Member

has-bot commented Aug 16, 2023

/packit test --labels tier0

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

pr-watson
pr-watson approved these changes Nov 2, 2023
View reviewed changes
Copy link
Contributor

@pr-watson pr-watson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After applying the suggestions I believe this PR is good to go, approved

@Andrew-ang9 Andrew-ang9 force-pushed the unsupported_messages branch from 4992b25 to 95c8b00 Compare January 2, 2024 17:54
@Venefilyn
Copy link
Member

/packit test --labels tier0

1 similar comment
@Venefilyn
Copy link
Member

/packit test --labels tier0

@danmyway
Copy link
Member

/packit test

@Andrew-ang9
Copy link
Contributor Author

/packit test --labels tier0

1 similar comment
@Andrew-ang9
Copy link
Contributor Author

/packit test --labels tier0

danmyway and others added 4 commits January 15, 2024 13:00
@danmyway @Andrew-ang9
Rewrite is_loaded_kernel_latest() log messages
8a8f969 
tests/hotfix/Remove parsing .env in conftest (oamg#838)

* we do not have any .env file in the repository, the line is redundant

Signed-off-by: Daniel Diblik <[email protected]>

Modify tests

* use `CONVERT2RHEL_SKIP_KERNEL_CURRENCY_CHECK` instead of deprecated `CONVERT2RHEL_UNSUPPORTED_SKIP_KERNEL_CURRENCY_CHECK`

Signed-off-by: Daniel Diblik <[email protected]>

Revised checks.py and checks_test.py

* After Rebasing some of the code changed, and added in code not from
  this PR.
* In checks.py the log message was edited and the rest of the code.
* In checks_test.py edited is_loaded_kernel_latet_unsupported_skip, and
  added is_loaded_kernel_latet_unsupported_skip_env_var
* Use `CONVERT2RHEL_SKIP_KERNEL_CURRENCY_CHECK` instead of deprecated `CONVERT2RHEL_UNSUPPORTED_SKIP_KERNEL_CURRENCY_CHECK`

Signed-off-by: Daniel Diblik <[email protected]>

Use the deprecated envar in latest_kernel_check_skip

Signed-off-by: Daniel Diblik <[email protected]>

[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

fixed the log message

* I belive that there is still an issue with the log message as I think
  the assert for the action is fails because of that, I am currently
  lookign into that though

Changed the action level description message

refactored the if statment

* this if statment now takes in account what envar is being used and
  will display the correct message acordingly

reverted the if statment back to the correct format

fix for the unit tests

* This is a temporary fix for the uint test I had to seperate one tests
  from the is_loaded_kernel_latest_skip_warnings as it wasn't passing
  with the log message test. For some unknown reason the envar is only
  set in all of the tests.
@Andrew-ang9
Removed duplicate code
2a76c2f
@Andrew-ang9
Wip needs one more test to pass unit testing
e2b0f43
@Andrew-ang9
Changed the id and what log for the unit test
1904142
@Andrew-ang9
Copy link
Contributor Author

/packit test --labels tier0

1 similar comment
@Venefilyn
Copy link
Member

/packit test --labels tier0

@Venefilyn
Copy link
Member

Integration tests unrelated, merging

@Venefilyn Venefilyn merged commit 6f470fc into oamg:main Jan 24, 2024
40 of 57 checks passed
Venefilyn added a commit to Venefilyn/convert2rhel that referenced this pull request Jan 24, 2024
@Venefilyn
Fix leftover remediation from oamg#684
51c08f8
@Venefilyn Venefilyn mentioned this pull request Jan 24, 2024
Merged
8 tasks
Venefilyn added a commit that referenced this pull request Jan 24, 2024
@Venefilyn
Fix leftover remediation from #684 (#1044)
7b1ae12
@Venefilyn Venefilyn mentioned this pull request Feb 22, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kokesak kokesak kokesak left review comments

@r0x0d r0x0d r0x0d left review comments

@abadger abadger abadger left review comments

@pr-watson pr-watson pr-watson approved these changes

@bocekm bocekm bocekm approved these changes

@danmyway danmyway danmyway approved these changes

@Venefilyn Venefilyn Venefilyn approved these changes

Assignees
No one assigned
Labels
kind/feature New feature or request tests/tier0 PR ready to run the essential test suit. Equivalent to `/packit test --labels tier0`.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@Andrew-ang9 @danmyway @has-bot @Venefilyn @abadger @r0x0d @bocekm @kokesak @pr-watson