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

[6.15.z] Prevent satellite-installer false negative (#17384) #17643

Open
wants to merge 1 commit into
base: 6.15.z
Choose a base branch
from
Open
Changes from all commits
Commits
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
16 changes: 11 additions & 5 deletions tests/foreman/installer/test_installer.py
Original file line number Diff line number Diff line change
Expand Up @@ -1378,8 +1378,8 @@ def install_satellite(satellite, installer_args, enable_fapolicyd=False):
satellite.execute(
'firewall-cmd --permanent --add-service RH-Satellite-6 && firewall-cmd --reload'
)
# Install Satellite
satellite.execute(
# Install Satellite and return result
return satellite.execute(
InstallerCommand(installer_args=installer_args).get_command(),
timeout='30m',
)
Expand Down Expand Up @@ -1508,7 +1508,9 @@ def sat_default_install(module_sat_ready_rhels):
f'foreman-initial-admin-password {settings.server.admin_password}',
]
sat = module_sat_ready_rhels.pop()
install_satellite(sat, installer_args)
assert install_satellite(sat, installer_args).status == 0, (
"Satellite installation failed (non-zero return code)"
)
sat.enable_satellite_ipv6_http_proxy()
return sat

Expand All @@ -1521,7 +1523,9 @@ def sat_fapolicyd_install(module_sat_ready_rhels):
f'foreman-initial-admin-password {settings.server.admin_password}',
]
sat = module_sat_ready_rhels.pop()
install_satellite(sat, installer_args, enable_fapolicyd=True)
assert install_satellite(sat, installer_args, enable_fapolicyd=True).status == 0, (
"Satellite installation failed (non-zero return code)"
)
sat.enable_ipv6_dnf_and_rhsm_proxy()
sat.enable_satellite_http_proxy()
return sat
Expand All @@ -1539,7 +1543,9 @@ def sat_non_default_install(module_sat_ready_rhels):
'foreman-proxy-plugin-discovery-install-images true',
]
sat = module_sat_ready_rhels.pop()
install_satellite(sat, installer_args, enable_fapolicyd=True)
assert install_satellite(sat, installer_args, enable_fapolicyd=True).status == 0, (
"Satellite installation failed (non-zero return code)"
)
sat.enable_satellite_ipv6_http_proxy()
sat.execute('dnf -y --disableplugin=foreman-protector install foreman-discovery-image')
return sat
Expand Down
Loading