Skip to content

Commit

Permalink
[Combined Jenkins Ask] Capsule testing for sanity (#15948)
Browse files Browse the repository at this point in the history
* Capsule Sanity Test from installer

* Design Change: only count change

* Satellite Maintain fapolicyd package installation
  • Loading branch information
jyejare committed Sep 20, 2024
1 parent fbbe49f commit 4613fe8
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
9 changes: 6 additions & 3 deletions pytest_fixtures/core/sat_cap_factory.py
Original file line number Diff line number Diff line change
Expand Up @@ -304,10 +304,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=2) as hosts:
yield hosts
if 'build_sanity' not in request.config.option.markexpr:
with Broker(**deploy_args, host_class=Satellite, _count=2) as hosts:
yield hosts
else:
yield [module_target_sat]


@pytest.fixture
Expand Down
11 changes: 7 additions & 4 deletions tests/foreman/installer/test_installer.py
Original file line number Diff line number Diff line change
Expand Up @@ -1374,8 +1374,9 @@ 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)
return module_sat_ready_rhels[0]
sat = module_sat_ready_rhels.pop()
install_satellite(sat, installer_args)
return sat


@pytest.fixture(scope='module')
Expand All @@ -1387,13 +1388,15 @@ def sat_non_default_install(module_sat_ready_rhels):
'foreman-rails-cache-store type:redis',
'foreman-proxy-content-pulpcore-hide-guarded-distributions false',
]
install_satellite(module_sat_ready_rhels[1], installer_args)
return module_sat_ready_rhels[1]
sat = module_sat_ready_rhels.pop()
install_satellite(sat, installer_args)
return sat


@pytest.mark.e2e
@pytest.mark.tier1
@pytest.mark.pit_server
@pytest.mark.build_sanity
def test_capsule_installation(sat_default_install, cap_ready_rhel, default_org):
"""Run a basic Capsule installation
Expand Down

0 comments on commit 4613fe8

Please sign in to comment.