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.17.z] Add IPv6 support in Centos/Oracle Host checkout #17673

Merged
merged 1 commit into from
Feb 24, 2025
+12 −2
Merged

[6.17.z] Add IPv6 support in Centos/Oracle Host checkout #17673

Show file tree
Hide file tree
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
12 changes: 10 additions & 2 deletions pytest_fixtures/core/contenthosts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,11 @@ def centos_host(request, version):
"distro": "centos",
"no_containers": True,
}
with Broker(**host_conf(request), host_class=ContentHost) as host:
with Broker(
**host_conf(request),
host_class=ContentHost,
deploy_network_type='ipv6' if settings.server.is_ipv6 else 'ipv4',
) as host:
yield host


Expand All @@ -258,7 +262,11 @@ def oracle_host(request, version):
"distro": "oracle",
"no_containers": True,
}
with Broker(**host_conf(request), host_class=ContentHost) as host:
with Broker(
**host_conf(request),
host_class=ContentHost,
deploy_network_type='ipv6' if settings.server.is_ipv6 else 'ipv4',
) as host:
yield host


Expand Down
2 changes: 2 additions & 0 deletions tests/foreman/api/test_convert2rhel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ def centos(
):
"""Deploy and register Centos host"""
major = version.split('.')[0]
centos_host.enable_ipv6_dnf_proxy()
assert centos_host.execute('yum -y update').status == 0
repo_url = settings.repos.convert2rhel.convert_to_rhel_repo.format(major)
repo = create_repo(module_target_sat, module_els_sca_manifest_org, repo_url)
Expand Down Expand Up @@ -171,6 +172,7 @@ def oracle(
):
"""Deploy and register Oracle host"""
major = version.split('.')[0]
oracle_host.enable_ipv6_dnf_proxy()
# disable rhn-client-tools because it obsoletes the subscription manager package
oracle_host.execute('echo "exclude=rhn-client-tools" >> /etc/yum.conf')
# Install and set correct RHEL compatible kernel and using non-UEK kernel, based on C2R docs
Expand Down
Loading