Fix test failures for rhel6 client

Author: jameerpathan111

conf/supportability.yaml

@@ -2,4 +2,4 @@ supportability:
   content_hosts:
     default_os_name: "RedHat"
     rhel:
-      versions: [6, 7,'7_fips', 8, '8_fips', 9, '9_fips']
+      versions: [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

@@ -98,7 +98,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)',
@@ -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'],
+        '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},
             }
         ],
@@ -1527,14 +1527,14 @@ def test_complete_sync_fixes_metadata(
             '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/longrun/test_oscap.py

@@ -31,21 +31,25 @@
     'rhel9': f'ak_{gen_string("alpha")}_rhel9',
     'rhel8': f'ak_{gen_string("alpha")}_rhel8',
     'rhel7': f'ak_{gen_string("alpha")}_rhel7',
+    'rhel6': f'ak_{gen_string("alpha")}_rhel6',
 }
 cv_name = {
     'rhel9': f'cv_{gen_string("alpha")}_rhel9',
     'rhel8': f'cv_{gen_string("alpha")}_rhel8',
     'rhel7': f'cv_{gen_string("alpha")}_rhel7',
+    'rhel6': f'cv_{gen_string("alpha")}_rhel6',
 }
 profiles = {
     'rhel9': OSCAP_PROFILE['ospp8+'],
     'rhel8': OSCAP_PROFILE['ospp8+'],
     'rhel7': OSCAP_PROFILE['security7'],
+    'rhel6': OSCAP_PROFILE['security6'],
 }
 rhel_repos = {
     'rhel9': settings.repos.rhel9_os,
     'rhel8': settings.repos.rhel8_os,
     'rhel7': settings.repos.rhel7_os,
+    'rhel6': settings.repos.rhel6_os,
 }