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

Upstream subscription code sync #5989

Merged
merged 4 commits into from
Dec 16, 2024

Conversation

M4rtinK
Copy link
Contributor

@M4rtinK M4rtinK commented Nov 11, 2024

Upstream version of the #5982 PR.

This should sync up all the so-far downstream subscription code changes from downstream to upstream.

Ideally going forward we should try avoiding such de-sync from happening again. :)

@M4rtinK M4rtinK added the f42 Fedora 42 label Nov 11, 2024
@M4rtinK M4rtinK changed the title Master subscription code sync Upstream subscription code sync Nov 11, 2024
@M4rtinK M4rtinK force-pushed the master-subscription_code_sync branch from d91e08b to d533d4c Compare November 12, 2024 16:31
@M4rtinK M4rtinK force-pushed the master-subscription_code_sync branch from d533d4c to 566cfe7 Compare November 12, 2024 17:04
@M4rtinK
Copy link
Contributor Author

M4rtinK commented Nov 12, 2024

/kickstart-test --testtype smoke

@M4rtinK
Copy link
Contributor Author

M4rtinK commented Nov 14, 2024

/kickstart-test --skip-testtypes whatever

1 similar comment
@M4rtinK
Copy link
Contributor Author

M4rtinK commented Nov 20, 2024

/kickstart-test --skip-testtypes whatever

@M4rtinK M4rtinK force-pushed the master-subscription_code_sync branch from 566cfe7 to 4ced5b9 Compare December 16, 2024 14:32
Copy link
Contributor

@KKoukiou KKoukiou left a comment

Choose a reason for hiding this comment

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

The cherry-picks are conflict free, this code is in RHEL 10 branch and tested, therefore I did not do a thorough review.

@M4rtinK M4rtinK force-pushed the master-subscription_code_sync branch from 4ced5b9 to 257ddea Compare December 16, 2024 14:49
Make sure we have recent enough RHSM version so that
the necessary baseline for Satellite support and other
modern subscription features (and Anaconda relevant fixes) are in places.

(cherry picked from commit d7bd942)

Resolves: RHEL-49661
Related: INSTALLER-3882
Related: INSTALLER-3063
This commit contains basically 3 things:
* Satellite support ported for the RHEL 9 branch, adjusted
  for changes done in upstream since RHEL 9 has been branched
* all Satellite support & subscription code fixes from the RHEL 9 branch
* removal of entitlement support as entitlements are no longer supported
  in RHEL 10 & Simple Content Access (SCA) is always used instead

(cherry picked from commit 4709e7b)

Resolves: RHEL-49661
Related: INSTALLER-3882
Related: INSTALLER-3903
Adjust the GTK GUI for the Subscription code changes:
- reflect Satellite being used in the GUI
- better UX when Simple Content Access (SCA) is used
- drop support for displaying attached entitlements
  (support for entitlements has been dropped in RHEL 10 system-wide)

(cherry picked from commit a006ed0)

Resolves: RHEL-49661
Related: INSTALLER-3882
Related: INSTALLER-3903
Adjust to Satellite support being added & entitlement support being
dropped. There were also some changes in how the registration tasks are
structured internally & unit tests need to be adjusted for that as well.

(cherry picked from commit 7a151a5)

Resolves: RHEL-49661
Related: INSTALLER-3882
Related: INSTALLER-3903
@M4rtinK M4rtinK force-pushed the master-subscription_code_sync branch from 257ddea to 4831787 Compare December 16, 2024 16:35
@M4rtinK
Copy link
Contributor Author

M4rtinK commented Dec 16, 2024

/kickstart-test --testtype smoke

@KKoukiou KKoukiou merged commit f5d4eb3 into rhinstaller:master Dec 16, 2024
18 of 19 checks passed
@KKoukiou KKoukiou deleted the master-subscription_code_sync branch December 16, 2024 17:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
f42 Fedora 42
Development

Successfully merging this pull request may close these issues.

2 participants