drop RHEL6 from supported distros

SatelliteQE · Feb 18, 2025 · f52e93e · f52e93e
1 parent f24c0bc
commit f52e93e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 18 deletions.
diff --git a/pytest_fixtures/component/provisioning_template.py b/pytest_fixtures/component/provisioning_template.py
@@ -91,15 +91,7 @@ def module_sync_kickstart_content(
         )
         task_status = module_target_sat.api.ForemanTask(id=task['id']).poll()
         assert task_status['result'] == 'success'
-
-    rhel_xy = Version(
-        constants.REPOS['kickstart'][f'rhel{rhel_ver}_bos_beta']['version']
-        if rhel_ver == 10  # TODO: Remove beta repos once RHEL10 is GA
-        else constants.REPOS['kickstart'][f'rhel{rhel_ver}']['version']
-        if rhel_ver == 7
-        else constants.REPOS['kickstart'][f'rhel{rhel_ver}_bos']['version']
-    )
-
+    rhel_xy = Version(constants.REPOS['kickstart'][repo_name]['version'])
     o_systems = module_target_sat.api.OperatingSystem().search(
         query={'search': f'family=Redhat and major={rhel_xy.major} and minor={rhel_xy.minor}'}
     )

diff --git a/robottelo/constants/__init__.py b/robottelo/constants/__init__.py
@@ -33,9 +33,8 @@
 
 
 DISTRO_DEFAULT = 'rhel7'
-DISTROS_SUPPORTED = ['rhel6', 'rhel7', 'rhel8', 'rhel9', 'rhel10']
+DISTROS_SUPPORTED = ['rhel7', 'rhel8', 'rhel9', 'rhel10']
 DISTROS_MAJOR_VERSION = {
-    'rhel6': 6,
     'rhel7': 7,
     'rhel8': 8,
     'rhel9': 9,

diff --git a/tests/foreman/api/test_capsulecontent.py b/tests/foreman/api/test_capsulecontent.py
@@ -869,13 +869,13 @@ def test_positive_sync_kickstart_repo(
         cvv = cvv.read()
         assert len(cvv.environment) == 2
         # Check for kickstart content on SAT and CAPS
-        tail = (
-            f'rhel/server/7/{REPOS["kickstart"][distro]["version"]}/x86_64/kickstart'
-            if distro == 'rhel7'
-            else f'{distro.split("_")[0]}/{REPOS["kickstart"][distro]["version"]}/beta/x86_64/baseos/kickstart'
-            if 'beta' in distro  # for future beta rhel distros
-            else f'{distro.split("_")[0]}/{REPOS["kickstart"][distro]["version"]}/x86_64/baseos/kickstart'  # noqa:E501
-        )
+        tail = None
+        if distro == 'rhel7':
+            tail = f'rhel/server/7/{REPOS["kickstart"][distro]["version"]}/x86_64/kickstart'
+        elif 'beta' in distro:
+            tail = f'{distro.split("_")[0]}/{REPOS["kickstart"][distro]["version"]}/beta/x86_64/baseos/kickstart'
+        else:
+            tail = f'{distro.split("_")[0]}/{REPOS["kickstart"][distro]["version"]}/x86_64/baseos/kickstart'  # noqa:E501
         url_base = (
             f'pulp/content/{function_sca_manifest_org.label}/{lce.label}/{cv.label}/'
             f'content/dist/{tail}'