Mark tests for RHEL6 client testing (#20760)

* Mark tests for RHEL6 client testing

* Fix test failures for rhel6 client

Author: jameerpathan111

conf/supportability.yaml

@@ -2,4 +2,4 @@ supportability:
   content_hosts:
     default_os_name: "RedHat"
     rhel:
-      versions: [7,'7_fips', 8, '8_fips', 9, '9_fips']
+      versions: [6, 7, '7_fips', 8, '8_fips', 9, '9_fips']

pytest_fixtures/component/provision_capsule_pxe.py

@@ -237,7 +237,7 @@ def capsule_provisioning_rhel_content(
         assert task_status['result'] == 'success'
     rhel_xy = Version(
         constants.REPOS['kickstart'][f'rhel{rhel_ver}']['version']
-        if rhel_ver == 7
+        if rhel_ver <= 7
         else constants.REPOS['kickstart'][f'rhel{rhel_ver}_bos']['version']
     )
     o_systems = sat.api.OperatingSystem().search(

pytest_fixtures/component/provision_pxe.py

@@ -99,7 +99,7 @@ def module_provisioning_rhel_content(
         assert task_status['result'] == 'success'
     rhel_xy = Version(
         constants.REPOS['kickstart'][f'rhel{rhel_ver}']['version']
-        if rhel_ver == 7
+        if rhel_ver <= 7
         else constants.REPOS['kickstart'][f'rhel{rhel_ver}_bos']['version']
     )
     o_systems = sat.api.OperatingSystem().search(

pytest_fixtures/component/provisioning_template.py

@@ -90,7 +90,7 @@ def module_sync_kickstart_content(
         assert task_status['result'] == 'success'
     rhel_xy = Version(
         constants.REPOS['kickstart'][f'rhel{rhel_ver}']['version']
-        if rhel_ver == 7
+        if rhel_ver <= 7
         else constants.REPOS['kickstart'][f'rhel{rhel_ver}_bos']['version']
     )
     o_systems = module_target_sat.api.OperatingSystem().search(

robottelo/constants/__init__.py

@@ -290,6 +290,7 @@
     'rhsc8': 'Red Hat Satellite Capsule 6.16 for RHEL 8 x86_64 (RPMs)',
     'rhsc9': 'Red Hat Satellite Capsule 6.16 for RHEL 9 x86_64 (RPMs)',
     'rhsc7_iso': 'Red Hat Satellite Capsule 6.4 (for RHEL 7 Server) (ISOs)',
+    'rhsclient6': 'Red Hat Satellite Client 6 (for RHEL 6 Server - ELS) (RPMs)',
     'rhsclient7': 'Red Hat Satellite Client 6 (for RHEL 7 Server) (RPMs)',
     'rhsclient8': 'Red Hat Satellite Client 6 for RHEL 8 x86_64 (RPMs)',
     'rhsclient9': 'Red Hat Satellite Client 6 for RHEL 9 x86_64 (RPMs)',
@@ -382,7 +383,7 @@
         'major_version': 6,
         'distro_repository': True,
         'key': 'rhel',
-        'version': '6.8',
+        'version': '6.10',
     },
     'rhs9': {
         'id': 'satellite-6.16-for-rhel-9-x86_64-rpms',
@@ -433,6 +434,15 @@
         'id': 'rhel-7-server-satellite-capsule-6.4-isos',
         'name': ('Red Hat Satellite Capsule 6.4 for RHEL 7 Server ISOs x86_64'),
     },
+    'rhsclient6': {
+        'id': 'rhel-6-server-els-satellite-client-6-rpms',
+        'name': ('Red Hat Satellite Client 6 for RHEL 6 Server - ELS RPMs x86_64'),
+        'version': '6',
+        'reposet': REPOSET['rhsclient6'],
+        'product': PRDS['rhel_els'],
+        'distro': 'rhel6',
+        'key': PRODUCT_KEY_SAT_CLIENT,
+    },
     'rhsclient7': {
         'id': 'rhel-7-server-satellite-client-6-rpms',
         'name': ('Red Hat Satellite Client 6 for RHEL 7 Server RPMs x86_64'),

tests/foreman/api/test_capsulecontent.py

@@ -1416,7 +1416,7 @@ def test_positive_remove_capsule_orphans(
         'repos_collection',
         [
             {
-                'distro': 'rhel9',
+                'distro': f'rhel{settings.content_host.default_rhel_version}',
                 'YumRepository': {'url': settings.repos.yum_0.url},
             }
         ],
@@ -1518,22 +1518,23 @@ def test_complete_sync_fixes_metadata(
             location=default_location,
             activation_keys=[repos_collection.setup_content_data['activation_key']['name']],
         )
-        assert result.status == 0, f'Failed to register host: {result.stderr}'
+        if rhel_contenthost.os_version.major != 6:
+            assert result.status == 0, f'Failed to register host: {result.stderr}'
         host = module_target_sat.api.Host().search(
             query={'search': f'name="{rhel_contenthost.hostname}"'}
         )[0]
         assert nc.id == host.content_facet_attributes['content_source_id'], (
             'Expected to see the Capsule as the content source'
         )
 
-        result = rhel_contenthost.execute('dnf repolist')
+        result = rhel_contenthost.execute('yum repolist')
         assert result.status == 0
         assert repos_collection.setup_content_data['repos'][0].content_label in result.stdout
 
-        result = rhel_contenthost.execute('dnf install -y cheetah')  # with dependencies
+        result = rhel_contenthost.execute('yum install -y cheetah')  # with dependencies
         assert result.status == 0
 
-        result = rhel_contenthost.execute('dnf -y update')
+        result = rhel_contenthost.execute('yum -y update')
         assert result.status == 0
 
     @pytest.mark.skip_if_not_set('capsule')

tests/foreman/api/test_computeresource_vmware.py

@@ -25,7 +25,7 @@
 @pytest.mark.parametrize('vmware', ['vmware7', 'vmware8'], indirect=True)
 @pytest.mark.parametrize('pxe_loader', ['bios', 'uefi'], indirect=True)
 @pytest.mark.parametrize('provision_method', ['build', 'bootdisk'])
-@pytest.mark.rhel_ver_match('[8]')
+@pytest.mark.rhel_ver_list([settings.content_host.default_rhel_version])
 def test_positive_provision_end_to_end(
     request,
     setting_update,

tests/foreman/api/test_discoveredhost.py

@@ -17,6 +17,7 @@
 import pytest
 from wait_for import TimedOutError, wait_for
 
+from robottelo.config import settings
 from robottelo.logging import logger
 from robottelo.utils.datafactory import valid_data_list
 
@@ -169,7 +170,7 @@ class TestDiscoveredHost:
     @pytest.mark.on_premises_provisioning
     @pytest.mark.parametrize('module_provisioning_sat', ['discovery'], indirect=True)
     @pytest.mark.parametrize('pxe_loader', ['bios', 'uefi'], indirect=True)
-    @pytest.mark.rhel_ver_list([8, 9])
+    @pytest.mark.rhel_ver_match(r'^\d+$')
     def test_positive_provision_pxe_host(
         self,
         module_provisioning_rhel_content,
@@ -223,7 +224,7 @@ def test_positive_provision_pxe_host(
     @pytest.mark.on_premises_provisioning
     @pytest.mark.parametrize('module_provisioning_sat', ['discovery'], indirect=True)
     @pytest.mark.parametrize('pxe_loader', ['bios', 'uefi'], indirect=True)
-    @pytest.mark.rhel_ver_list([8, 9])
+    @pytest.mark.rhel_ver_match(r'^\d+$')
     def test_positive_provision_pxe_less_host(
         self,
         module_discovery_sat,
@@ -352,7 +353,7 @@ def test_positive_refresh_facts_pxe_host(self, module_target_sat):
     @pytest.mark.on_premises_provisioning
     @pytest.mark.parametrize('module_provisioning_sat', ['discovery'], indirect=True)
     @pytest.mark.parametrize('pxe_loader', ['uefi'], indirect=True)
-    @pytest.mark.rhel_ver_match('9')
+    @pytest.mark.rhel_ver_list([settings.content_host.default_rhel_version])
     def test_positive_reboot_pxe_host(
         self,
         module_provisioning_rhel_content,
@@ -394,7 +395,7 @@ def test_positive_reboot_pxe_host(
 
     @pytest.mark.on_premises_provisioning
     @pytest.mark.parametrize('module_provisioning_sat', ['discovery'], indirect=True)
-    @pytest.mark.rhel_ver_match('9')
+    @pytest.mark.rhel_ver_list([settings.content_host.default_rhel_version])
     def test_positive_reboot_all_pxe_hosts(
         self,
         module_provisioning_rhel_content,

tests/foreman/api/test_errata.py

@@ -515,7 +515,7 @@ def _publish_and_wait(sat, org, cv, search_rate=1, max_tries=10):
 
 
 @pytest.mark.upgrade
-@pytest.mark.rhel_ver_match('[^6]')
+@pytest.mark.rhel_ver_match(r'^\d+$')
 @pytest.mark.no_containers
 @pytest.mark.e2e
 def test_positive_install_in_hc(
@@ -579,9 +579,10 @@ def test_positive_install_in_hc(
             target=target_sat,
             loc=None,
         )
-        assert result.status == 0, (
-            f'Failed to register the host - {client.hostname}: {result.stderr}'
-        )
+        if client.os_version.major != 6:
+            assert result.status == 0, (
+                f'Failed to register the host - {client.hostname}: {result.stderr}'
+            )
         client.add_rex_key(satellite=target_sat)
         assert client.subscribed
         client.run(r'subscription-manager repos --enable \*')
@@ -705,7 +706,7 @@ def test_positive_install_in_hc(
         )
 
 
-@pytest.mark.rhel_ver_match('[^6]')
+@pytest.mark.rhel_ver_match(r'^\d+$')
 @pytest.mark.no_containers
 @pytest.mark.e2e
 @pytest.mark.pit_client
@@ -1496,7 +1497,8 @@ def test_positive_incremental_update_apply_to_envs_cvs(
         target=target_sat,
         loc=None,
     )
-    assert result.status == 0, f'Failed to register the host: {rhel_contenthost.hostname}'
+    if rhel_contenthost.os_version.major != 6:
+        assert result.status == 0, f'Failed to register the host: {rhel_contenthost.hostname}'
     assert rhel_contenthost.subscribed
     rhel_contenthost.execute(r'subscription-manager repos --enable \*')
 

tests/foreman/api/test_http_proxy.py

@@ -144,7 +144,7 @@ def test_positive_end_to_end(
 
 @pytest.mark.e2e
 @pytest.mark.upgrade
-@pytest.mark.rhel_ver_match('9')
+@pytest.mark.rhel_ver_match(r'^\d+$')
 @pytest.mark.run_in_one_thread
 @pytest.mark.parametrize(
     'setup_http_proxy',
@@ -179,7 +179,8 @@ def test_positive_install_content_with_http_proxy(
 
     :parametrized: yes
     """
-    repo_to_use = 'rhsclient9'
+    rhelver = rhel_contenthost.os_version.major
+    repo_to_use = f'rhsclient{rhelver}'
     pkg_name = 'katello-host-tools'
     org = function_sca_manifest_org
     lce = module_target_sat.api.LifecycleEnvironment(organization=org).create()
@@ -215,7 +216,8 @@ def test_positive_install_content_with_http_proxy(
         target=module_target_sat,
         loc=None,
     )
-    assert result.status == 0, f'Failed to register the host: {rhel_contenthost.hostname}'
+    if rhel_contenthost.os_version.major != 6:
+        assert result.status == 0, f'Failed to register the host: {rhel_contenthost.hostname}'
     assert rhel_contenthost.subscribed
 
     result = rhel_contenthost.execute(f'yum install -y {pkg_name}')