Skip to content

Commit

Permalink
[6.15.z] Use sca enabled manifest for test_positive_configure_cloud_c…
Browse files Browse the repository at this point in the history
…onnector (#13909)
  • Loading branch information
Satellite-QE authored Jan 26, 2024
1 parent a3d7bc1 commit 1d5f14b
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 4 deletions.
10 changes: 10 additions & 0 deletions pytest_fixtures/component/taxonomy.py
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,16 @@ def module_extra_rhel_entitlement_manifest():
yield manifest


@pytest.fixture(scope='module')
def module_extra_rhel_sca_manifest():
"""Yields a manifest in sca mode with subscriptions determined by the
'manifest_category.extra_rhel_entitlement` setting in conf/manifest.yaml."""
with Manifester(
manifest_category=settings.manifest.extra_rhel_entitlement, simple_content_access="enabled"
) as manifest:
yield manifest


@pytest.fixture(scope='module')
def module_sca_manifest():
"""Yields a manifest in Simple Content Access mode with subscriptions determined by the
Expand Down
6 changes: 2 additions & 4 deletions tests/foreman/ui/test_rhc.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,11 @@ def fixture_setup_rhc_satellite(
request,
module_target_sat,
module_rhc_org,
module_extra_rhel_entitlement_manifest,
module_extra_rhel_sca_manifest,
):
"""Create Organization and activation key after successful test execution"""
if settings.rh_cloud.crc_env == 'prod':
module_target_sat.upload_manifest(
module_rhc_org.id, module_extra_rhel_entitlement_manifest.content
)
module_target_sat.upload_manifest(module_rhc_org.id, module_extra_rhel_sca_manifest.content)
yield
if request.node.rep_call.passed:
# Enable and sync required repos
Expand Down

0 comments on commit 1d5f14b

Please sign in to comment.