New parametrizations for Errata api,cli,ui

tests/foreman/api/test_errata.py

@@ -656,7 +656,7 @@ def test_positive_install_in_hc(
 
 
 @pytest.mark.tier3
-@pytest.mark.rhel_ver_match(r'^(?!.*(7|fips)).*$')  # exclude any fips or major ver 7
+@pytest.mark.rhel_ver_match('N-2')
 @pytest.mark.no_containers
 @pytest.mark.e2e
 @pytest.mark.pit_client

tests/foreman/cli/test_errata.py

@@ -1230,7 +1230,7 @@ def errata_host(
 
 @pytest.mark.tier2
 @pytest.mark.no_containers
-@pytest.mark.rhel_ver_match('8')
+@pytest.mark.rhel_ver_match('N-1')  # Newest major RHEL version (N), and the one prior.
 def test_apply_errata_using_default_content_view(errata_host, module_sca_manifest_org, target_sat):
     """Updating an applicable errata on a host attached to the default content view
      causes the errata to not be applicable.
@@ -1281,7 +1281,7 @@ def test_apply_errata_using_default_content_view(errata_host, module_sca_manifes
 
 @pytest.mark.tier2
 @pytest.mark.no_containers
-@pytest.mark.rhel_ver_match('8')
+@pytest.mark.rhel_ver_match('N-1')
 def test_update_applicable_package_using_default_content_view(errata_host, target_sat):
     """Updating an applicable package on a host attached to the default content view causes the
     package to not be applicable or installable.
@@ -1340,7 +1340,7 @@ def test_update_applicable_package_using_default_content_view(errata_host, targe
 
 @pytest.mark.tier2
 @pytest.mark.no_containers
-@pytest.mark.rhel_ver_match('8')
+@pytest.mark.rhel_ver_match('N-1')
 def test_downgrade_applicable_package_using_default_content_view(errata_host, target_sat):
     """Downgrading a package on a host attached to the default content view
     causes the package to become applicable and installable.
@@ -1389,7 +1389,7 @@ def test_downgrade_applicable_package_using_default_content_view(errata_host, ta
 
 
 @pytest.mark.tier2
-@pytest.mark.rhel_ver_match('8')
+@pytest.mark.rhel_ver_match('N-2')
 def test_install_applicable_package_to_registered_host(errata_host, target_sat):
     """Installing an older package to an already registered host should show the newer package
     and errata as applicable and installable.
@@ -1437,7 +1437,7 @@ def test_install_applicable_package_to_registered_host(errata_host, target_sat):
 
 @pytest.mark.tier2
 @pytest.mark.no_containers
-@pytest.mark.rhel_ver_match('8')
+@pytest.mark.rhel_ver_match('N-2')
 def test_downgrading_package_shows_errata_from_library(
     errata_host, module_sca_manifest_org, target_sat
 ):
@@ -1542,7 +1542,7 @@ def test_errata_list_by_contentview_filter(module_sca_manifest_org, module_targe
     assert errata_count != errata_count_cvf
 
 
-@pytest.mark.rhel_ver_match('8')
+@pytest.mark.rhel_ver_match('N-2')
 def test_positive_verify_errata_recalculate_tasks(target_sat, errata_host):
     """Verify 'Actions::Katello::Applicability::Hosts::BulkGenerate' tasks proceed on 'worker-hosts-queue-1.service'
 

tests/foreman/ui/test_errata.py

@@ -292,7 +292,7 @@ def cleanup():
 
 @pytest.mark.e2e
 @pytest.mark.tier3
-@pytest.mark.rhel_ver_match('[^7]|10')
+@pytest.mark.rhel_ver_match('N-2')  # Newest major RHEL version (N), and two prior.
 @pytest.mark.parametrize('registered_contenthost', [[CUSTOM_REPO_URL]], indirect=True)
 @pytest.mark.no_containers
 def test_end_to_end(
@@ -486,7 +486,7 @@ def test_end_to_end(
 
 @pytest.mark.tier2
 @pytest.mark.no_containers
-@pytest.mark.rhel_ver_match('8')
+@pytest.mark.rhel_ver_match('N-2')
 @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(
@@ -968,7 +968,7 @@ def test_positive_apply_for_all_hosts(
 
 @pytest.mark.tier2
 @pytest.mark.upgrade
-@pytest.mark.rhel_ver_match('8')
+@pytest.mark.rhel_ver_match('N-1')
 def test_positive_view_cve(session, module_product, module_sca_manifest_org, target_sat):
     """View CVE number(s) in Errata Details page
 
@@ -1093,7 +1093,7 @@ def test_positive_filter_by_environment(
     [[CUSTOM_REPO_URL]],
     indirect=True,
 )
-@pytest.mark.rhel_ver_match('8')
+@pytest.mark.rhel_ver_match('N-2')
 def test_positive_content_host_previous_env(
     session,
     module_cv,
@@ -1162,7 +1162,7 @@ def test_positive_content_host_previous_env(
 
 
 @pytest.mark.tier2
-@pytest.mark.rhel_ver_match('8')
+@pytest.mark.rhel_ver_match('N-2')
 @pytest.mark.parametrize(
     'registered_contenthost',
     [[CUSTOM_REPO_URL]],
@@ -1194,7 +1194,7 @@ def test_positive_check_errata(session, registered_contenthost):
 
 
 @pytest.mark.tier3
-@pytest.mark.rhel_ver_match('[8, 9]')
+@pytest.mark.rhel_ver_match('N-2')
 @pytest.mark.parametrize(
     'registered_contenthost',
     [['Library', CUSTOM_REPO_URL]],
@@ -1266,7 +1266,7 @@ def test_positive_host_content_library(
 
 
 @pytest.mark.tier3
-@pytest.mark.rhel_ver_match('8')
+@pytest.mark.rhel_ver_match('N-1')
 @pytest.mark.parametrize(
     'registered_contenthost',
     [[CUSTOM_REPO_URL]],
@@ -1331,7 +1331,7 @@ def test_positive_errata_search_type(session, module_sca_manifest_org, registere
 
 
 @pytest.mark.tier3
-@pytest.mark.rhel_ver_match('8')
+@pytest.mark.rhel_ver_match('N-2')
 @pytest.mark.parametrize(
     'registered_contenthost',
     [[CUSTOM_REPO_URL]],
@@ -1437,7 +1437,7 @@ def test_positive_show_count_on_host_pages(session, module_org, registered_conte
 
 
 @pytest.mark.tier3
-@pytest.mark.rhel_ver_match('8')
+@pytest.mark.rhel_ver_match('N-2')
 @pytest.mark.parametrize(
     'registered_contenthost',
     [[CUSTOM_REPO_URL]],
@@ -1511,7 +1511,7 @@ def test_positive_check_errata_counts_by_type_on_host_details_page(
 @pytest.mark.upgrade
 @pytest.mark.skipif((not settings.robottelo.REPOS_HOSTING_URL), reason='Missing repos_hosting_url')
 @pytest.mark.parametrize('setting_update', ['errata_status_installable'], indirect=True)
-@pytest.mark.rhel_ver_match('8')
+@pytest.mark.rhel_ver_match('N-1')
 @pytest.mark.parametrize(
     'registered_contenthost',
     [[CUSTOM_REPO_URL]],