Skip to content

Commit

Permalink
Sanity and other fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
jyejare committed May 30, 2024
1 parent 8308a0a commit ed2878f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
5 changes: 3 additions & 2 deletions pytest_fixtures/core/xdist.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ def align_to_satellite(request, worker_id, satellite_factory):
if settings.server.hostname:
sanity_sat = Satellite(settings.server.hostname)
sanity_sat.unregister()
broker_sat = Satellite.get_host_by_hostname(sanity_sat.hostname)
Broker(hosts=[broker_sat]).checkin()
if settings.server.auto_checkin:
broker_sat = Satellite.get_host_by_hostname(sanity_sat.hostname)
Broker(hosts=[broker_sat]).checkin()
else:
# clear any hostname that may have been previously set
settings.set("server.hostname", None)
Expand Down
4 changes: 4 additions & 0 deletions robottelo/hosts.py
Original file line number Diff line number Diff line change
Expand Up @@ -1780,6 +1780,10 @@ def enable_satellite_or_capsule_module_for_rhel8(self):
Note: Make sure required repos are enabled before using this.
"""
if self.os_version.major == 8:
if settings.server.is_ipv6:
self.execute(
f"echo -e 'proxy={settings.server.http_proxy_ipv6_url}' >> /etc/dnf/dnf.conf"
)
assert (
self.execute(
f'dnf -y module enable {self.product_rpm_name}:el{self.os_version.major}'
Expand Down
2 changes: 1 addition & 1 deletion tests/foreman/installer/test_installer.py
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ def sat_default_install(module_sat_ready_rhels):
install_satellite(module_sat_ready_rhels[0], installer_args)
sat = module_sat_ready_rhels[0]
http_proxy = sat.enable_ipv6_http_proxy()
yield
yield sat
sat.disable_ipv6_http_proxy(http_proxy)


Expand Down

0 comments on commit ed2878f

Please sign in to comment.