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

[6.14.z cherrypick] Fix assertion for installing katello-ca cert and updating rhel_contenthost fixture to test default rhel version] #17627

Merged
merged 1 commit into from
Feb 18, 2025
Merged

[6.14.z cherrypick] Fix assertion for installing katello-ca cert and updating rhel_contenthost fixture to test default rhel version] #17627

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions tests/foreman/cli/test_registration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,8 @@ def test_host_registration_end_to_end(
assert rhel_contenthost.subscription_config['server']['port'] == CLIENT_PORT


def test_upgrade_katello_ca_consumer_rpm(
module_org, module_location, target_sat, rhel7_contenthost
):
@pytest.mark.rhel_ver_list([settings.content_host.default_rhel_version])
def test_upgrade_katello_ca_consumer_rpm(module_org, module_location, target_sat, rhel_contenthost):
"""After updating the consumer cert the rhsm.conf file still points to Satellite host name
and not Red Hat CDN for subscription.

Expand All @@ -113,11 +112,12 @@ def test_upgrade_katello_ca_consumer_rpm(
consumer_cert_src = f'{consumer_cert_name}-1.0-1.src.rpm'
new_consumer_cert_rpm = f'{consumer_cert_name}-1.0-2.noarch.rpm'
spec_file = f'{consumer_cert_name}.spec'
vm = rhel7_contenthost
vm = rhel_contenthost
# Install consumer cert and check server URL in /etc/rhsm/rhsm.conf
assert vm.execute(
result = vm.execute(
f'rpm -Uvh "http://{target_sat.hostname}/pub/{consumer_cert_name}-1.0-1.noarch.rpm"'
)
assert result.status == 0
# Check server URL is not Red Hat CDN's "subscription.rhsm.redhat.com"
assert vm.subscription_config['server']['hostname'] != 'subscription.rhsm.redhat.com'
assert target_sat.hostname == vm.subscription_config['server']['hostname']
Expand Down