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

Jump to bottom

[6.16.z] [Combined Jenkins Ask] Capsule testing for sanity #16403

Open
wants to merge 1 commit into
base: 6.16.z
Choose a base branch
from
Open

[6.16.z] [Combined Jenkins Ask] Capsule testing for sanity #16403

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
9 changes: 6 additions & 3 deletions pytest_fixtures/core/sat_cap_factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,10 +314,13 @@ def sat_ready_rhel(request):


@pytest.fixture(scope='module')
def module_sat_ready_rhels(request):
def module_sat_ready_rhels(request, module_target_sat):
deploy_args = get_deploy_args(request)
with Broker(**deploy_args, host_class=Satellite, _count=3) as hosts:
yield hosts
if 'build_sanity' not in request.config.option.markexpr:
with Broker(**deploy_args, host_class=Satellite, _count=3) as hosts:
yield hosts
else:
yield [module_target_sat]


@pytest.fixture
Expand Down
23 changes: 13 additions & 10 deletions tests/foreman/installer/test_installer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,12 @@ def install_satellite(satellite, installer_args, enable_fapolicyd=False):
snap=settings.server.version.snap,
)
if enable_fapolicyd:
assert (
satellite.execute('dnf -y install fapolicyd && systemctl enable --now fapolicyd').status
== 0
)
if satellite.execute('rpm -q satellite-maintain').status == 0:
# Installing the rpm on existing sat needs sat-maintain perms
cmmd = 'satellite-maintain packages install fapolicyd -y'
else:
cmmd = 'dnf -y install fapolicyd'
assert satellite.execute(f'{cmmd} && systemctl enable --now fapolicyd').status == 0
satellite.install_satellite_or_capsule_package()
if enable_fapolicyd:
assert satellite.execute('rpm -q foreman-fapolicyd').status == 0
Expand Down Expand Up @@ -269,8 +271,8 @@ def sat_default_install(module_sat_ready_rhels):
'scenario satellite',
f'foreman-initial-admin-password {settings.server.admin_password}',
]
install_satellite(module_sat_ready_rhels[0], installer_args)
sat = module_sat_ready_rhels[0]
sat = module_sat_ready_rhels.pop()
install_satellite(sat, installer_args)
sat.enable_ipv6_http_proxy()
return sat

Expand All @@ -282,8 +284,8 @@ def sat_fapolicyd_install(module_sat_ready_rhels):
'scenario satellite',
f'foreman-initial-admin-password {settings.server.admin_password}',
]
install_satellite(module_sat_ready_rhels[1], installer_args, enable_fapolicyd=True)
sat = module_sat_ready_rhels[1]
sat = module_sat_ready_rhels.pop()
install_satellite(sat, installer_args, enable_fapolicyd=True)
sat.enable_ipv6_http_proxy()
return sat

Expand All @@ -299,8 +301,8 @@ def sat_non_default_install(module_sat_ready_rhels):
'enable-foreman-plugin-discovery',
'foreman-proxy-plugin-discovery-install-images true',
]
install_satellite(module_sat_ready_rhels[2], installer_args, enable_fapolicyd=True)
sat = module_sat_ready_rhels[2]
sat = module_sat_ready_rhels.pop()
install_satellite(sat, installer_args, enable_fapolicyd=True)
sat.enable_ipv6_http_proxy()
sat.execute('dnf -y --disableplugin=foreman-protector install foreman-discovery-image')
return sat
Expand All @@ -309,6 +311,7 @@ def sat_non_default_install(module_sat_ready_rhels):
@pytest.mark.e2e
@pytest.mark.tier1
@pytest.mark.pit_server
@pytest.mark.build_sanity
@pytest.mark.parametrize(
'setting_update', [f'http_proxy={settings.http_proxy.un_auth_proxy_url}'], indirect=True
)
Expand Down
Loading