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.

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

[RHELC-1515] Fix the enabled repository check after the conversion #1192

Merged
merged 1 commit into from
May 9, 2024

Conversation

kokesak
Copy link
Member

@kokesak kokesak commented Apr 24, 2024

We found several problems with the enabled repository check. This PR should fix those plus some minor code improvement changes.

Jira Issues:

Checklist

  • PR has been tested manually in a VM (either author or reviewer)
  • Jira issue has been made public if possible
  • [RHELC-1515] 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

@kokesak kokesak force-pushed the fix-enabled-repos-check branch from 9d9e03b to e6872b6 Compare April 24, 2024 12:24
Copy link

codecov bot commented Apr 24, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 95.54%. Comparing base (e618783) to head (bf88a36).
Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #1192   +/-   ##
=======================================
  Coverage   95.54%   95.54%           
=======================================
  Files          53       53           
  Lines        4642     4642           
  Branches      815      815           
=======================================
  Hits         4435     4435           
  Misses        129      129           
  Partials       78       78           
Flag Coverage Δ
centos-linux-7 90.69% <ø> (ø)
centos-linux-8 91.62% <ø> (ø)
centos-linux-9 91.68% <ø> (ø)

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.

@kokesak kokesak added tests/tier0 PR ready to run the essential test suit. Equivalent to `/packit test --labels tier0`. kind/tests Improvement or enhancement of the tests labels Apr 24, 2024
@has-bot
Copy link
Member

has-bot commented Apr 24, 2024

/packit test --labels tier0


Comment generated by an automation.

@kokesak kokesak force-pushed the fix-enabled-repos-check branch from e6872b6 to 15df91f Compare April 24, 2024 13:42
@kokesak kokesak added tests/tier0 PR ready to run the essential test suit. Equivalent to `/packit test --labels tier0`. and removed tests/tier0 PR ready to run the essential test suit. Equivalent to `/packit test --labels tier0`. labels Apr 24, 2024
@has-bot
Copy link
Member

has-bot commented Apr 24, 2024

/packit test --labels tier0


Comment generated by an automation.

@kokesak
Copy link
Member Author

kokesak commented Apr 25, 2024

/packit test --labels tier0

@kokesak kokesak requested a review from danmyway April 25, 2024 11:02
@kokesak kokesak force-pushed the fix-enabled-repos-check branch 2 times, most recently from c4039fc to baa58d1 Compare April 26, 2024 05:33
@kokesak
Copy link
Member Author

kokesak commented Apr 26, 2024

/packit test --labels tier0

@kokesak kokesak force-pushed the fix-enabled-repos-check branch from baa58d1 to c4039fc Compare April 26, 2024 07:53
@kokesak
Copy link
Member Author

kokesak commented Apr 29, 2024

/packit test --labels tier0

@kokesak kokesak force-pushed the fix-enabled-repos-check branch from 9c3c798 to 21dc7e5 Compare April 29, 2024 13:46
@kokesak
Copy link
Member Author

kokesak commented Apr 29, 2024

/packit test --labels tier0

1 similar comment
@kokesak
Copy link
Member Author

kokesak commented Apr 29, 2024

/packit test --labels tier0

Copy link
Member

@danmyway danmyway left a comment

Choose a reason for hiding this comment

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

Overall looks good, I like the code reduction.
Just a few minor notes + the new test did not get triggered at all.

Also, please update the pytest.ini with the updated and new markers.

Comment on lines 111 to 112
@pytest.mark.test_rhsm_eus_account_conversion
def test_rhsm_non_eus_account(convert2rhel):
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
@pytest.mark.test_rhsm_eus_account_conversion
def test_rhsm_non_eus_account(convert2rhel):
@pytest.mark.test_rhsm_non_eus_account
def test_rhsm_non_eus_account(convert2rhel):

Copy&Paste error.
Additionally, this test did not even run, given the lack of metadata in main.fmf

Copy link
Member Author

Choose a reason for hiding this comment

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

Comment on lines 114 to 116
Verify that Convert2RHEL is working properly when EUS repositories are not available for conversions
to RHEL EUS minor versions (8.6, ...) and the --eus option is provided. The regular repositories
should be enabled.
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
Verify that Convert2RHEL is working properly when EUS repositories are not available for conversions
to RHEL EUS minor versions (8.6, ...) and the --eus option is provided. The regular repositories
should be enabled.
Verify that Convert2RHEL is working properly when EUS repositories are not available for conversions (the account does not have the EUS SKU available)
to RHEL EUS minor versions (8.6, ...) and the --eus option is provided. The regular repositories
should be enabled as a fallback option.

Copy link
Member Author

Choose a reason for hiding this comment

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

@kokesak kokesak force-pushed the fix-enabled-repos-check branch from 21dc7e5 to 7ef3374 Compare May 7, 2024 07:47
@kokesak
Copy link
Member Author

kokesak commented May 7, 2024

/packit test --labels tier0

@kokesak
Copy link
Member Author

kokesak commented May 7, 2024

/packit test

@kokesak kokesak force-pushed the fix-enabled-repos-check branch from 7ef3374 to a26d8b5 Compare May 7, 2024 08:48
We found several problems with the enabled repository check.
This PR should fix those plus some minor code improvement changes.
Reference ticket: https://issues.redhat.com/browse/RHELC-1515

Co-authored-by: Rodolfo Olivieri <rodolfo.olivieri3@gmail.com>
@kokesak kokesak force-pushed the fix-enabled-repos-check branch from a26d8b5 to bf88a36 Compare May 7, 2024 14:12
@kokesak
Copy link
Member Author

kokesak commented May 7, 2024

/packit test --labels tier0

Copy link
Member

@danmyway danmyway left a comment

Choose a reason for hiding this comment

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

👍

@danmyway danmyway merged commit ff00d89 into oamg:main May 9, 2024
31 of 33 checks passed
@hosekadam hosekadam mentioned this pull request May 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/tests Improvement or enhancement of the tests tests/tier0 PR ready to run the essential test suit. Equivalent to `/packit test --labels tier0`.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants