diff --git a/robottelo/constants/__init__.py b/robottelo/constants/__init__.py index 0653168a820..3fd33b44e7d 100644 --- a/robottelo/constants/__init__.py +++ b/robottelo/constants/__init__.py @@ -32,13 +32,14 @@ ) -DISTRO_DEFAULT = 'rhel7' -DISTROS_SUPPORTED = ['rhel6', 'rhel7', 'rhel8', 'rhel9'] +DISTRO_DEFAULT = 'rhel9' +DISTROS_SUPPORTED = ['rhel6', 'rhel7', 'rhel8', 'rhel9', 'rhel10'] DISTROS_MAJOR_VERSION = { 'rhel6': 6, 'rhel7': 7, 'rhel8': 8, 'rhel9': 9, + 'rhel10': 10, } MAJOR_VERSION_DISTRO = {value: key for key, value in DISTROS_MAJOR_VERSION.items()} @@ -303,14 +304,16 @@ 'rhel8_bos': 'Red Hat Enterprise Linux 8 for x86_64 - BaseOS (Kickstart)', 'rhel8_aps': 'Red Hat Enterprise Linux 8 for x86_64 - AppStream (Kickstart)', 'rhel9_bos': 'Red Hat Enterprise Linux 9 for x86_64 - BaseOS (Kickstart)', - 'rhel9_aps': 'Red Hat Enterprise Linux 9 for x86_64 - AppStream (Kickstart)', 'rhel10_bos': 'Red Hat Enterprise Linux 10 for x86_64 - BaseOS (Kickstart)', + 'rhel10_aps': 'Red Hat Enterprise Linux 10 for x86_64 - AppStream (Kickstart)', + 'rhel9_aps': 'Red Hat Enterprise Linux 9 for x86_64 - AppStream (Kickstart)', }, - 'rhel8_bos': 'Red Hat Enterprise Linux 8 for x86_64 - BaseOS (RPMs)', - 'rhel8_aps': 'Red Hat Enterprise Linux 8 for x86_64 - AppStream (RPMs)', - 'rhel9_bos': 'Red Hat Enterprise Linux 9 for x86_64 - BaseOS (RPMs)', 'rhel10_bos': 'Red Hat Enterprise Linux 10 for x86_64 - BaseOS (RPMs)', + 'rhel10_aps': 'Red Hat Enterprise Linux 10 for x86_64 - AppStream (RPMs)', + 'rhel9_bos': 'Red Hat Enterprise Linux 9 for x86_64 - BaseOS (RPMs)', 'rhel9_aps': 'Red Hat Enterprise Linux 9 for x86_64 - AppStream (RPMs)', + 'rhel8_bos': 'Red Hat Enterprise Linux 8 for x86_64 - BaseOS (RPMs)', + 'rhel8_aps': 'Red Hat Enterprise Linux 8 for x86_64 - AppStream (RPMs)', 'rhel7_extra': 'Red Hat Enterprise Linux 7 Server - Extras (RPMs)', 'rhel7_optional': 'Red Hat Enterprise Linux 7 Server - Optional (RPMs)', 'rhel7_sup': 'Red Hat Enterprise Linux 7 Server - Supplementary (RPMs)', @@ -561,6 +564,44 @@ 'product': PRDS['rhel9'], 'distro': 'rhel9', }, + 'rhel10_bos': { + 'id': 'rhel-10-for-x86_64-baseos-kickstart', + 'name': 'Red Hat Enterprise Linux 10 for x86_64 - BaseOS (Kickstart) 10.0', + 'version': '10.0', + 'reposet': REPOSET['kickstart']['rhel10_bos'], + 'product': PRDS['rhel10'], + 'distro': 'rhel10', + }, + 'rhel10_aps': { + 'id': 'rhel-10-for-x86_64-appstream-kickstart', + 'name': 'Red Hat Enterprise Linux 10 for x86_64 - AppStream Kickstart 10.0', + 'version': '10.0', + 'reposet': REPOSET['kickstart']['rhel10_aps'], + 'product': PRDS['rhel10'], + 'distro': 'rhel10', + }, + }, + 'rhel10_bos': { + 'id': 'rhel-10-for-x86_64-baseos-rpms', + 'name': 'Red Hat Enterprise Linux 10 for x86_64 - BaseOS RPMs 10', + 'releasever': '10', + 'basearch': 'x86_64', + 'version': '10.0', + 'reposet': REPOSET['rhel10_bos'], + 'product': PRDS['rhel10'], + 'distro': 'rhel10', + 'key': 'rhel10_bos', + }, + 'rhel10_aps': { + 'id': 'rhel-10-for-x86_64-appstream-rpms', + 'name': 'Red Hat Enterprise Linux 10 for x86_64 - AppStream RPMs 10', + 'releasever': '10', + 'basearch': 'x86_64', + 'version': '10.0', + 'reposet': REPOSET['rhel10_aps'], + 'product': PRDS['rhel10'], + 'distro': 'rhel10', + 'key': 'rhel10_aps', }, 'rhel8_bos': { 'id': 'rhel-8-for-x86_64-baseos-rpms', @@ -807,7 +848,11 @@ REAL_RHEL8_1_PACKAGE_FILENAME = 'puppet-agent-6.19.1-1.el8sat.x86_64' REAL_RHEL8_2_PACKAGE_FILENAME = 'puppet-agent-6.26.0-1.el8sat.x86_64' REAL_RHEL9_PACKAGE_FILENAME = '' -REAL_RHEL10_PACKAGE_FILENAME = '' +REAL_RHEL10_REPO_URL = 'https://download.eng.bos.redhat.com/rhel-10/composes/RHEL-10/' +REAL_RHEL10_PACKAGE_NAME = '' +REAL_RHEL10_OUTDATED_PACKAGE = '' +REAL_RHEL10_UPDATED_PACKAGE = '' +REAL_RHEL10_ERRATA_ID = '' FAKE_0_CUSTOM_PACKAGE_GROUP_NAME = 'birds' FAKE_3_YUM_OUTDATED_PACKAGES = [ 'acme-package-1.0.1-1.noarch', diff --git a/tests/foreman/api/test_errata.py b/tests/foreman/api/test_errata.py index 8d6afff7047..34d90e190ce 100644 --- a/tests/foreman/api/test_errata.py +++ b/tests/foreman/api/test_errata.py @@ -114,6 +114,92 @@ def custom_repo(module_sca_manifest_org, module_lce, module_cv, activation_key, ) +@pytest.fixture(scope='module') +def rh_repo_module_manifest(module_sca_manifest_org, module_target_sat): + """Use module manifest org, creates RHEL8 sat-tools repo, syncs and returns RH repo.""" + # enable rhel repo and return its ID + rh_repo_id = module_target_sat.api_factory.enable_rhrepo_and_fetchid( + basearch=DEFAULT_ARCHITECTURE, + org_id=module_sca_manifest_org.id, + product=PRDS['rhel8'], + repo=REPOS['rhst8']['name'], + reposet=REPOSET['rhst8'], + releasever='None', + ) + # Sync step because repo is not synced by default + rh_repo = module_target_sat.api.Repository(id=rh_repo_id).read() + rh_repo.sync() + return rh_repo + + +@pytest.fixture(scope='module') +def rhel10_module_repo(module_sca_manifest_org, module_target_sat): + """In module manifest org, creates RHEL10 repo with synced content, returns it.""" + repo_id = module_target_sat.api_factory.create_sync_custom_repo( + module_sca_manifest_org.id, + repo_url=settings.repos.RHEL10_OS.APPSTREAM, + ) + return module_target_sat.api.Repository(id=repo_id).read() + + +@pytest.fixture(scope='module') +def setup_fake_yum_content( + module_sca_manifest_org, + rhel10_module_repo, + activation_key, + module_lce, + module_cv, + module_target_sat, + return_result=True, +): + """Setup yum content for rhel content host w/ errata + Using RHEL10 Appstream RH repo, and custom repo FAKE_YUM_9. + Published to content-view and promoted to lifecycle-environment. + + Raises `AssertionError` if one or more of the setup components read are empty. + + :return: if return_result is True: otherwise None + A dictionary (_result) with the satellite instances of activaton-key, organization, + content-view, lifecycle-environment, rh_repo, custom_repo. + """ + org = module_sca_manifest_org + # Setup Custom and RH repos + custom_repo_id = module_target_sat.cli_factory.setup_org_for_a_custom_repo( + { + 'url': CUSTOM_REPO_URL, + 'organization-id': org.id, + 'lifecycle-environment-id': module_lce.id, + 'activationkey-id': activation_key.id, + 'content-view-id': module_cv.id, + } + )['repository-id'] + custom_repo = module_target_sat.api.Repository(id=custom_repo_id).read() + custom_repo.sync() + # Sync and add RH repo + rh_repo = module_target_sat.api.Repository(id=rhel10_module_repo.id).read() + rh_repo.sync() + module_target_sat.cli.ContentView.add_repository( + {'id': module_cv.id, 'organization-id': org.id, 'repository-id': rh_repo.id} + ) + _cv = cv_publish_promote(module_target_sat, org, module_cv, module_lce) + module_cv = _cv['content-view'] + latest_cvv = _cv['content-view-version'] + + _result = { + 'activation-key': activation_key.read(), + 'organization': org.read(), + 'content-view': module_cv.read(), + 'content-view-version': latest_cvv.read(), + 'lifecycle-environment': module_lce.read(), + 'rh_repo': rh_repo.read(), + 'custom_repo': custom_repo.read(), + } + assert all( + entry for entry in _result.values() + ), f'One or more necessary components are not present: {_result}' + return _result if return_result else None + + def _validate_errata_counts(host, errata_type, expected_value, timeout=120): """Check whether host contains expected errata counts.""" for _ in range(timeout // 5): @@ -1007,64 +1093,6 @@ def test_positive_list_sorted_filtered(custom_repo, target_sat): assert cve_ids == sorted(cve_ids, reverse=True) -@pytest.fixture(scope='module') -def setup_fake_yum_content( - module_sca_manifest_org, - rh_repo_module_manifest, - activation_key, - module_lce, - module_cv, - module_target_sat, - return_result=True, -): - """Setup yum content for rhel content host w/ errata - Using rh repo satellite-tools, and custom repo FAKE_YUM_9. - Published to content-view and promoted to lifecycle-environment. - - Raises `AssertionError` if one or more of the setup components read are empty. - - :return: if return_result is True: otherwise None - A dictionary (_result) with the satellite instances of activaton-key, organization, - content-view, lifecycle-environment, rh_repo, custom_repo. - """ - org = module_sca_manifest_org - # Setup Custom and RH repos - custom_repo_id = module_target_sat.cli_factory.setup_org_for_a_custom_repo( - { - 'url': CUSTOM_REPO_URL, - 'organization-id': org.id, - 'lifecycle-environment-id': module_lce.id, - 'activationkey-id': activation_key.id, - 'content-view-id': module_cv.id, - } - )['repository-id'] - custom_repo = module_target_sat.api.Repository(id=custom_repo_id).read() - custom_repo.sync() - # Sync and add RH repo - rh_repo = module_target_sat.api.Repository(id=rh_repo_module_manifest.id).read() - rh_repo.sync() - module_target_sat.cli.ContentView.add_repository( - {'id': module_cv.id, 'organization-id': org.id, 'repository-id': rh_repo.id} - ) - _cv = cv_publish_promote(module_target_sat, org, module_cv, module_lce) - module_cv = _cv['content-view'] - latest_cvv = _cv['content-view-version'] - - _result = { - 'activation-key': activation_key.read(), - 'organization': org.read(), - 'content-view': module_cv.read(), - 'content-view-version': latest_cvv.read(), - 'lifecycle-environment': module_lce.read(), - 'rh_repo': rh_repo.read(), - 'custom_repo': custom_repo.read(), - } - assert all( - entry for entry in _result.values() - ), f'One or more necessary components are not present: {_result}' - return _result if return_result else None - - @pytest.mark.tier2 def test_positive_get_count_for_host( setup_fake_yum_content, activation_key, rhel10_contenthost, module_target_sat @@ -1135,10 +1163,10 @@ def test_positive_get_count_for_host( @pytest.mark.upgrade @pytest.mark.tier3 def test_positive_get_applicable_for_host( - activation_key, + setup_fake_yum_content, rhel10_contenthost, + activation_key, target_sat, - setup_fake_yum_content, ): """Get applicable errata ids for a host @@ -1163,9 +1191,8 @@ def test_positive_get_applicable_for_host( :CaseImportance: Medium """ org = setup_fake_yum_content['organization'] - custom_repo = setup_fake_yum_content['rh_repo'] - - rhel10_contenthost.create_custom_repos(**{f'{custom_repo.name}': custom_repo.url}) + # rh_repo = setup_fake_yum_content['rh_repo'] + # rhel10_contenthost.create_custom_repos(**{f'{rh_repo.name}': rh_repo.url}) result = rhel10_contenthost.register( activation_keys=activation_key.name, target=target_sat, @@ -1196,7 +1223,8 @@ def test_positive_get_applicable_for_host( assert len(erratum) == 1 assert CUSTOM_REPO_ERRATA_ID in [errata['errata_id'] for errata in erratum] # Install outdated applicable real package (from RH repo) - rhel10_contenthost.run(f'yum install -y {REAL_RHEL8_1_PACKAGE_FILENAME}') + # rhel10_contenthost.run(f'yum install -y {REAL_RHEL8_1_PACKAGE_FILENAME}') + # rhel10_contenthost.run(f'yum install -y {REAL_RHEL10_OUTDATED_FILENAME}') erratum = _fetch_available_errata(host, 2) assert len(erratum) == 2 assert REAL_RHEL8_1_ERRATA_ID in [errata['errata_id'] for errata in erratum] @@ -1355,24 +1383,6 @@ def errata_host_lce(module_sca_manifest_org, target_sat): return target_sat.api.LifecycleEnvironment(organization=module_sca_manifest_org).create() -@pytest.fixture(scope='module') -def rh_repo_module_manifest(module_sca_manifest_org, module_target_sat): - """Use module manifest org, creates RHEL8 tools repo, syncs and returns RH repo.""" - # enable rhel repo and return its ID - rh_repo_id = module_target_sat.api_factory.enable_rhrepo_and_fetchid( - basearch=DEFAULT_ARCHITECTURE, - org_id=module_sca_manifest_org.id, - product=PRDS['rhel8'], - repo=REPOS['rhst8']['name'], - reposet=REPOSET['rhst8'], - releasever='None', - ) - # Sync step because repo is not synced by default - rh_repo = module_target_sat.api.Repository(id=rh_repo_id).read() - rh_repo.sync() - return rh_repo - - @pytest.mark.tier3 def test_positive_incremental_update_apply_to_envs_cvs( target_sat, diff --git a/tests/foreman/longrun/test_oscap.py b/tests/foreman/longrun/test_oscap.py index 710be7b83b9..45ab4a75be5 100644 --- a/tests/foreman/longrun/test_oscap.py +++ b/tests/foreman/longrun/test_oscap.py @@ -28,21 +28,25 @@ from robottelo.logging import logger ak_name = { + 'rhel10': f'ak_{gen_string("alpha")}_rhel10', 'rhel9': f'ak_{gen_string("alpha")}_rhel9', 'rhel8': f'ak_{gen_string("alpha")}_rhel8', 'rhel7': f'ak_{gen_string("alpha")}_rhel7', } cv_name = { + 'rhel10': f'cv_{gen_string("alpha")}_rhel10', 'rhel9': f'cv_{gen_string("alpha")}_rhel9', 'rhel8': f'cv_{gen_string("alpha")}_rhel8', 'rhel7': f'cv_{gen_string("alpha")}_rhel7', } profiles = { + 'rhel10': OSCAP_PROFILE[''], 'rhel9': OSCAP_PROFILE['cbrhel9'], 'rhel8': OSCAP_PROFILE['ospp8'], 'rhel7': OSCAP_PROFILE['security7'], } rhel_repos = { + 'rhel10': settings.repos.rhel10_os, 'rhel9': settings.repos.rhel9_os, 'rhel8': settings.repos.rhel8_os, 'rhel7': settings.repos.rhel7_os, diff --git a/tests/foreman/ui/test_contenthost.py b/tests/foreman/ui/test_contenthost.py index cfbcc150d9d..0ed133dead7 100644 --- a/tests/foreman/ui/test_contenthost.py +++ b/tests/foreman/ui/test_contenthost.py @@ -63,7 +63,7 @@ def module_org(module_target_sat): @pytest.fixture -@pytest.mark.rhel_ver_match('N-1') +@pytest.mark.rhel_ver_match('N-0') # Newest rhel10 def vm(module_repos_collection_with_manifest, rhel_contenthost, target_sat): """Virtual machine registered in satellite""" module_repos_collection_with_manifest.setup_virtual_machine(rhel_contenthost) @@ -73,7 +73,7 @@ def vm(module_repos_collection_with_manifest, rhel_contenthost, target_sat): @pytest.fixture -@pytest.mark.rhel_ver_match('N-1') +@pytest.mark.rhel_ver_match('N-0') def vm_module_streams(module_repos_collection_with_manifest, rhel_contenthost, target_sat): """Virtual machine registered in satellite""" module_repos_collection_with_manifest.setup_virtual_machine(rhel_contenthost) @@ -125,12 +125,11 @@ def get_rhel_lifecycle_support(rhel_version): @pytest.mark.e2e -@pytest.mark.tier3 @pytest.mark.parametrize( 'module_repos_collection_with_manifest', [ { - 'distro': 'rhel7', + 'distro': 'rhel10', 'RHELAnsibleEngineRepository': {'cdn': True}, 'SatelliteToolsRepository': {}, 'YumRepository': [ @@ -147,6 +146,7 @@ def test_positive_end_to_end( session, module_org, default_location, + module_target_sat, module_repos_collection_with_manifest, ): """Create all entities required for content host, set up host, register it @@ -154,7 +154,7 @@ def test_positive_end_to_end( :id: f43f2826-47c1-4069-9c9d-2410fd1b622c - :setup: Register a rhel7 vm as a content host. Import repos + :setup: Register a rhel10 vm as a content host. Import repos collection and associated manifest. :steps: @@ -255,7 +255,7 @@ def test_positive_end_to_end( 'module_repos_collection_with_manifest', [ { - 'distro': 'rhel7', + 'distro': 'rhel10', 'RHELAnsibleEngineRepository': {'cdn': True}, 'SatelliteToolsRepository': {}, 'YumRepository': [ @@ -340,7 +340,7 @@ def test_positive_end_to_end_bulk_update(session, default_location, vm, target_s 'module_repos_collection_with_manifest', [ { - 'distro': 'rhel7', + 'distro': 'rhel10', 'RHELAnsibleEngineRepository': {'cdn': True}, 'SatelliteToolsRepository': {}, 'YumRepository': [ @@ -379,7 +379,7 @@ def test_negative_install_package(session, default_location, vm): 'module_repos_collection_with_manifest', [ { - 'distro': 'rhel7', + 'distro': 'rhel10', 'RHELAnsibleEngineRepository': {'cdn': True}, 'SatelliteToolsRepository': {}, 'YumRepository': [ @@ -416,7 +416,7 @@ def test_positive_remove_package(session, default_location, vm): 'module_repos_collection_with_manifest', [ { - 'distro': 'rhel7', + 'distro': 'rhel10', 'RHELAnsibleEngineRepository': {'cdn': True}, 'SatelliteToolsRepository': {}, 'YumRepository': [ @@ -454,7 +454,7 @@ def test_positive_upgrade_package(session, default_location, vm): 'module_repos_collection_with_manifest', [ { - 'distro': 'rhel7', + 'distro': 'rhel10', 'RHELAnsibleEngineRepository': {'cdn': True}, 'SatelliteToolsRepository': {}, 'YumRepository': [ @@ -493,7 +493,7 @@ def test_positive_install_package_group(session, default_location, vm): 'module_repos_collection_with_manifest', [ { - 'distro': 'rhel7', + 'distro': 'rhel10', 'RHELAnsibleEngineRepository': {'cdn': True}, 'SatelliteToolsRepository': {}, 'YumRepository': [ @@ -530,7 +530,7 @@ def test_positive_remove_package_group(session, default_location, vm): 'module_repos_collection_with_manifest', [ { - 'distro': 'rhel7', + 'distro': 'rhel10', 'RHELAnsibleEngineRepository': {'cdn': True}, 'SatelliteToolsRepository': {}, 'YumRepository': [ @@ -574,7 +574,7 @@ def test_positive_search_errata_non_admin( 'module_repos_collection_with_manifest', [ { - 'distro': 'rhel7', + 'distro': 'rhel10', 'RHELAnsibleEngineRepository': {'cdn': True}, 'SatelliteToolsRepository': {}, 'YumRepository': [ @@ -634,7 +634,7 @@ def test_positive_ensure_errata_applicability_with_host_reregistered(session, de 'module_repos_collection_with_manifest', [ { - 'distro': 'rhel7', + 'distro': 'rhel10', 'RHELAnsibleEngineRepository': {'cdn': True}, 'SatelliteToolsRepository': {}, 'YumRepository': [ @@ -694,7 +694,7 @@ def test_positive_host_re_registration_with_host_rename( 'module_repos_collection_with_manifest', [ { - 'distro': 'rhel7', + 'distro': 'rhel10', 'RHELAnsibleEngineRepository': {'cdn': True}, 'SatelliteToolsRepository': {}, 'YumRepository': [ @@ -785,10 +785,10 @@ def test_positive_check_ignore_facts_os_setting( 'module_repos_collection_with_manifest', [ { - 'distro': 'rhel8', + 'distro': 'rhel10', 'YumRepository': [ - {'url': settings.repos.rhel8_os.baseos}, - {'url': settings.repos.rhel8_os.appstream}, + {'url': settings.repos.rhel10_os.baseos}, + {'url': settings.repos.rhel10_os.appstream}, {'url': settings.repos.satutils_repo}, {'url': settings.repos.module_stream_1.url}, ], @@ -910,10 +910,10 @@ def test_module_stream_actions_on_content_host( 'module_repos_collection_with_manifest', [ { - 'distro': 'rhel8', + 'distro': 'rhel10', 'YumRepository': [ - {'url': settings.repos.rhel8_os.baseos}, - {'url': settings.repos.rhel8_os.appstream}, + {'url': settings.repos.rhel10_os.baseos}, + {'url': settings.repos.rhel10_os.appstream}, {'url': settings.repos.satutils_repo}, {'url': settings.repos.module_stream_1.url}, ], @@ -975,10 +975,10 @@ def test_module_streams_customize_action(session, default_location, vm_module_st 'module_repos_collection_with_manifest', [ { - 'distro': 'rhel8', + 'distro': 'rhel10', 'YumRepository': [ - {'url': settings.repos.rhel8_os.baseos}, - {'url': settings.repos.rhel8_os.appstream}, + {'url': settings.repos.rhel10_os.baseos}, + {'url': settings.repos.rhel10_os.appstream}, {'url': settings.repos.satutils_repo}, {'url': settings.repos.module_stream_1.url}, ], @@ -1052,10 +1052,10 @@ def test_install_modular_errata(session, default_location, vm_module_streams): 'module_repos_collection_with_manifest', [ { - 'distro': 'rhel8', + 'distro': 'rhel10', 'YumRepository': [ - {'url': settings.repos.rhel8_os.baseos}, - {'url': settings.repos.rhel8_os.appstream}, + {'url': settings.repos.rhel10_os.baseos}, + {'url': settings.repos.rhel10_os.appstream}, {'url': settings.repos.satutils_repo}, {'url': settings.repos.module_stream_1.url}, ], @@ -1117,10 +1117,10 @@ def test_module_status_update_from_content_host_to_satellite( 'module_repos_collection_with_manifest', [ { - 'distro': 'rhel8', + 'distro': 'rhel10', 'YumRepository': [ - {'url': settings.repos.rhel8_os.baseos}, - {'url': settings.repos.rhel8_os.appstream}, + {'url': settings.repos.rhel10_os.baseos}, + {'url': settings.repos.rhel10_os.appstream}, {'url': settings.repos.satutils_repo}, {'url': settings.repos.module_stream_1.url}, ], @@ -1201,10 +1201,10 @@ def test_module_status_update_without_force_upload_package_profile( 'module_repos_collection_with_manifest', [ { - 'distro': 'rhel8', + 'distro': 'rhel10', 'YumRepository': [ - {'url': settings.repos.rhel8_os.baseos}, - {'url': settings.repos.rhel8_os.appstream}, + {'url': settings.repos.rhel10_os.baseos}, + {'url': settings.repos.rhel10_os.appstream}, {'url': settings.repos.satutils_repo}, {'url': settings.repos.module_stream_1.url}, ], @@ -1276,10 +1276,10 @@ def test_module_stream_update_from_satellite(session, default_location, vm_modul 'module_repos_collection_with_manifest', [ { - 'distro': 'rhel8', + 'distro': 'rhel10', 'YumRepository': [ - {'url': settings.repos.rhel8_os.baseos}, - {'url': settings.repos.rhel8_os.appstream}, + {'url': settings.repos.rhel10_os.baseos}, + {'url': settings.repos.rhel10_os.appstream}, {'url': settings.repos.satutils_repo}, {'url': settings.repos.module_stream_1.url}, ], @@ -1317,10 +1317,10 @@ def test_syspurpose_attributes_empty(session, default_location, vm_module_stream 'module_repos_collection_with_manifest', [ { - 'distro': 'rhel8', + 'distro': 'rhel10', 'YumRepository': [ - {'url': settings.repos.rhel8_os.baseos}, - {'url': settings.repos.rhel8_os.appstream}, + {'url': settings.repos.rhel10_os.baseos}, + {'url': settings.repos.rhel10_os.appstream}, {'url': settings.repos.satutils_repo}, {'url': settings.repos.module_stream_1.url}, ], @@ -1361,10 +1361,10 @@ def test_set_syspurpose_attributes_cli(session, default_location, vm_module_stre 'module_repos_collection_with_manifest', [ { - 'distro': 'rhel8', + 'distro': 'rhel10', 'YumRepository': [ - {'url': settings.repos.rhel8_os.baseos}, - {'url': settings.repos.rhel8_os.appstream}, + {'url': settings.repos.rhel10_os.baseos}, + {'url': settings.repos.rhel10_os.appstream}, {'url': settings.repos.satutils_repo}, {'url': settings.repos.module_stream_1.url}, ], @@ -1409,7 +1409,7 @@ def test_unset_syspurpose_attributes_cli(session, default_location, vm_module_st 'module_repos_collection_with_manifest', [ { - 'distro': 'rhel7', + 'distro': 'rhel10', 'RHELAnsibleEngineRepository': {'cdn': True}, 'SatelliteToolsRepository': {}, 'YumRepository': [ diff --git a/tests/foreman/ui/test_errata.py b/tests/foreman/ui/test_errata.py index 47cdb21d2f5..f544c18b105 100644 --- a/tests/foreman/ui/test_errata.py +++ b/tests/foreman/ui/test_errata.py @@ -486,7 +486,7 @@ def test_end_to_end( @pytest.mark.tier2 @pytest.mark.no_containers -@pytest.mark.rhel_ver_match('N-2') +@pytest.mark.rhel_ver_match('N-3') @pytest.mark.parametrize('registered_contenthost', [[CUSTOM_REPO_3_URL]], indirect=True) @pytest.mark.skipif((not settings.robottelo.REPOS_HOSTING_URL), reason='Missing repos_hosting_url') def test_host_content_errata_tab_pagination(