test expanded api coverage w/ rhel10

SatelliteQE · Jan 8, 2025 · 3850055 · 3850055
1 parent 7ad6910
commit 3850055
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 6 deletions.
diff --git a/robottelo/constants/__init__.py b/robottelo/constants/__init__.py
@@ -1747,6 +1747,7 @@
     'dsrhel7': 'DISA STIG for Red Hat Enterprise Linux 7',
     'dsrhel8': 'DISA STIG for Red Hat Enterprise Linux 8',
     'dsrhel9': 'DISA STIG for Red Hat Enterprise Linux 9',
+    'dsrhel10': 'DISA STIG for Red Hat Enterprise Linux 10',
     'esp': 'Example Server Profile',
     'rhccp': 'Red Hat Corporate Profile for Certified Cloud Providers (RH CCP)',
     'firefox': 'Mozilla Firefox STIG',
@@ -1759,6 +1760,7 @@
     'cbrhel7': 'PCI-DSS v3.2.1 Control Baseline for Red Hat Enterprise Linux 7',
     'cbrhel8': 'PCI-DSS v3.2.1 Control Baseline for Red Hat Enterprise Linux 8',
     'cbrhel9': 'PCI-DSS v4.0 Control Baseline for Red Hat Enterprise Linux 9',
+    'cbrhel10': '',
     'ppgpo': 'Protection Profile for General Purpose Operating Systems',
     'acscee': 'Australian Cyber Security Centre (ACSC) Essential Eight',
     'ospp7': 'OSPP - Protection Profile for General Purpose Operating Systems v4.2.1',

diff --git a/tests/foreman/api/test_ansible.py b/tests/foreman/api/test_ansible.py
@@ -474,7 +474,7 @@ def test_positive_ansible_job_on_multiple_host(
         assert result.status_label == 'failed'
 
     @pytest.mark.no_containers
-    @pytest.mark.rhel_ver_match('[^6]')
+    @pytest.mark.rhel_ver_match(r'^(?!.*fips).*$')  # all major versions, excluding fips
     def test_positive_ansible_localhost_job_on_host(
         self, target_sat, module_org, module_location, module_ak_with_synced_repo, rhel_contenthost
     ):

diff --git a/tests/foreman/api/test_capsulecontent.py b/tests/foreman/api/test_capsulecontent.py
@@ -807,7 +807,7 @@ def test_flatpak_pulpcore_enpoint(self, target_sat, module_capsule_configured):
     @pytest.mark.e2e
     @pytest.mark.tier4
     @pytest.mark.skip_if_not_set('capsule')
-    @pytest.mark.parametrize('distro', ['rhel7', 'rhel8_bos', 'rhel9_bos'])
+    @pytest.mark.parametrize('distro', ['rhel7', 'rhel8_bos', 'rhel9_bos', 'rhel10_bos_beta'])
     def test_positive_sync_kickstart_repo(
         self, target_sat, module_capsule_configured, function_sca_manifest_org, distro
     ):

diff --git a/tests/foreman/api/test_provisioning_puppet.py b/tests/foreman/api/test_provisioning_puppet.py
@@ -96,7 +96,7 @@ def test_positive_puppet_bootstrap(
 
 
 @pytest.mark.on_premises_provisioning
-@pytest.mark.rhel_ver_match(r'^(?!.*fips).*$')
+@pytest.mark.rhel_ver_match(r'^(?!.*fips).*$')  # all versions, excluding any 'fips'
 def test_host_provisioning_with_external_puppetserver(
     request,
     external_puppet_server,

diff --git a/tests/foreman/destructive/test_capsule_loadbalancer.py b/tests/foreman/destructive/test_capsule_loadbalancer.py
@@ -252,7 +252,7 @@ def test_loadbalancer_install_package(
     assert result.status == 0
 
 
-@pytest.mark.rhel_ver_match('[^6]')
+@pytest.mark.rhel_ver_match('N-2')
 @pytest.mark.tier1
 def test_client_register_through_lb(
     loadbalancer_setup,

diff --git a/tests/foreman/longrun/test_oscap.py b/tests/foreman/longrun/test_oscap.py
@@ -39,6 +39,7 @@
 }
 # TODO: add rhel10 profile when available
 profiles = {
+    'rhel10': OSCAP_PROFILE['dsrhel10'],
     'rhel9': OSCAP_PROFILE['cbrhel9'],
     'rhel8': OSCAP_PROFILE['ospp8'],
     'rhel7': OSCAP_PROFILE['security7'],

diff --git a/tests/foreman/ui/test_activationkey.py b/tests/foreman/ui/test_activationkey.py
@@ -918,7 +918,7 @@ def test_negative_usage_limit(session, module_org, target_sat):
 
 
 @pytest.mark.no_containers
-@pytest.mark.rhel_ver_match('^6')
+@pytest.mark.rhel_ver_match(r'^(?!.*fips).*$')  # all versions, excluding any 'fips'
 @pytest.mark.tier3
 @pytest.mark.upgrade
 @pytest.mark.skipif((not settings.robottelo.repos_hosting_url), reason='Missing repos_hosting_url')

diff --git a/tests/foreman/ui/test_reporttemplates.py b/tests/foreman/ui/test_reporttemplates.py
@@ -534,7 +534,7 @@ def test_positive_generate_all_installed_packages_report(
 
 @pytest.mark.tier2
 @pytest.mark.no_containers
-@pytest.mark.rhel_ver_match('[^6]')
+@pytest.mark.rhel_ver_match(r'^(?!.*fips).*$')  # all versions, excluding any 'fips'
 def test_positive_installable_errata_with_user(
     session, target_sat, function_org, function_lce, function_location, rhel_contenthost
 ):