fix osrelease from rocky/alma/epel errata

Author: furlongm

errata/sources/repos/yum.py

@@ -184,22 +184,49 @@ def get_osrelease_names(e, update):
     return osreleases
 
 
+def get_existing_el_osreleases(major_version):
+    """ Returns existing OSReleases for EL-based distros matching the major version
+    """
+    from operatingsystems.models import OSRelease
+    el_patterns = [
+        f'RHEL {major_version}',
+        f'Red Hat Enterprise Linux {major_version}',
+        f'CentOS Stream {major_version}',
+        f'CentOS {major_version}',
+        f'Rocky Linux {major_version}',
+        f'Alma Linux {major_version}',
+        f'AlmaLinux {major_version}',
+        f'Oracle Linux {major_version}',
+    ]
+    return list(OSRelease.objects.filter(name__in=el_patterns))
+
+
 def add_updateinfo_osreleases(e, collection, osrelease_names):
     """ Adds OSRelease objects to an Erratum
         rocky and alma need some renaming
+        EPEL maps to existing EL-based OSReleases only
     """
     if not osrelease_names:
         collection_name = collection.find('name')
         if collection_name is not None:
             osrelease_name = collection_name.text
             osrelease_names.append(osrelease_name)
     for osrelease_name in osrelease_names:
-        if osrelease_name.startswith('almalinux'):
+        if osrelease_name.startswith('Fedora EPEL'):
+            # "Fedora EPEL 10.0" → map to existing EL 10 OSReleases
+            version_str = osrelease_name.split()[-1]  # "10.0"
+            major_version = version_str.split('.')[0]  # "10"
+            for osrelease in get_existing_el_osreleases(major_version):
+                e.osreleases.add(osrelease)
+            continue
+        elif osrelease_name.startswith('almalinux'):
             version = osrelease_name.split('-')[1]
-            osrelease_name = 'Alma Linux ' + version
+            major_version = version.split('.')[0]
+            osrelease_name = 'Alma Linux ' + major_version
         elif osrelease_name.startswith('rocky-linux'):
             version = osrelease_name.split('-')[2]
-            osrelease_name = 'Rocky Linux ' + version
+            major_version = version.split('.')[0]
+            osrelease_name = 'Rocky Linux ' + major_version
         elif osrelease_name in ['Amazon Linux', 'Amazon Linux AMI']:
             osrelease_name = 'Amazon Linux 1'
         osrelease = get_or_create_osrelease(name=osrelease_name)

errata/tests/test_yum.py

@@ -0,0 +1,174 @@
+# Copyright 2025 Marcus Furlong <furlongm@gmail.com>
+#
+# This file is part of Patchman.
+#
+# Patchman is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, version 3 only.
+#
+# Patchman is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Patchman. If not, see <http://www.gnu.org/licenses/>
+
+from unittest.mock import MagicMock
+
+from django.test import TestCase
+from django.utils import timezone
+
+from errata.models import Erratum
+from errata.sources.repos.yum import (
+    add_updateinfo_osreleases, get_existing_el_osreleases,
+)
+from operatingsystems.models import OSRelease
+
+
+class GetExistingELOSReleasesTest(TestCase):
+    """Tests for get_existing_el_osreleases()"""
+
+    def test_returns_empty_when_no_matching_osreleases(self):
+        """Should return empty list when no EL OSReleases exist"""
+        result = get_existing_el_osreleases('10')
+        self.assertEqual(result, [])
+
+    def test_returns_matching_rhel_osrelease(self):
+        """Should return RHEL OSRelease when it exists"""
+        rhel = OSRelease.objects.create(name='RHEL 10')
+        result = get_existing_el_osreleases('10')
+        self.assertIn(rhel, result)
+
+    def test_returns_matching_rocky_osrelease(self):
+        """Should return Rocky Linux OSRelease when it exists"""
+        rocky = OSRelease.objects.create(name='Rocky Linux 10')
+        result = get_existing_el_osreleases('10')
+        self.assertIn(rocky, result)
+
+    def test_returns_matching_alma_osrelease(self):
+        """Should return Alma Linux OSRelease when it exists"""
+        alma = OSRelease.objects.create(name='Alma Linux 10')
+        result = get_existing_el_osreleases('10')
+        self.assertIn(alma, result)
+
+    def test_returns_multiple_matching_osreleases(self):
+        """Should return all matching EL OSReleases"""
+        rhel = OSRelease.objects.create(name='RHEL 10')
+        rocky = OSRelease.objects.create(name='Rocky Linux 10')
+        alma = OSRelease.objects.create(name='Alma Linux 10')
+        result = get_existing_el_osreleases('10')
+        self.assertEqual(len(result), 3)
+        self.assertIn(rhel, result)
+        self.assertIn(rocky, result)
+        self.assertIn(alma, result)
+
+    def test_does_not_return_different_version(self):
+        """Should not return OSReleases with different major version"""
+        rocky9 = OSRelease.objects.create(name='Rocky Linux 9')
+        rocky10 = OSRelease.objects.create(name='Rocky Linux 10')
+        result = get_existing_el_osreleases('10')
+        self.assertIn(rocky10, result)
+        self.assertNotIn(rocky9, result)
+
+    def test_matches_centos_stream(self):
+        """Should match CentOS Stream"""
+        centos = OSRelease.objects.create(name='CentOS Stream 10')
+        result = get_existing_el_osreleases('10')
+        self.assertIn(centos, result)
+
+    def test_matches_oracle_linux(self):
+        """Should match Oracle Linux"""
+        oracle = OSRelease.objects.create(name='Oracle Linux 10')
+        result = get_existing_el_osreleases('10')
+        self.assertIn(oracle, result)
+
+
+class AddUpdateinfoOSReleasesTest(TestCase):
+    """Tests for add_updateinfo_osreleases()"""
+
+    def setUp(self):
+        self.erratum = Erratum.objects.create(
+            name='TEST-2025-001',
+            e_type='security',
+            issue_date=timezone.now(),
+        )
+
+    def _mock_collection(self, name=None):
+        """Create a mock collection element"""
+        collection = MagicMock()
+        name_elem = MagicMock()
+        if name:
+            name_elem.text = name
+            collection.find.return_value = name_elem
+        else:
+            collection.find.return_value = None
+        return collection
+
+    def test_epel_maps_to_existing_el_osreleases(self):
+        """EPEL should map to existing EL OSReleases only"""
+        rocky = OSRelease.objects.create(name='Rocky Linux 10')
+        alma = OSRelease.objects.create(name='Alma Linux 10')
+        collection = self._mock_collection()
+
+        add_updateinfo_osreleases(self.erratum, collection, ['Fedora EPEL 10.0'])
+
+        self.assertIn(rocky, self.erratum.osreleases.all())
+        self.assertIn(alma, self.erratum.osreleases.all())
+
+    def test_epel_does_not_create_fake_osrelease(self):
+        """EPEL should not create 'Fedora EPEL 10' OSRelease"""
+        collection = self._mock_collection()
+
+        add_updateinfo_osreleases(self.erratum, collection, ['Fedora EPEL 10.0'])
+
+        # No OSReleases should be created or associated
+        self.assertEqual(self.erratum.osreleases.count(), 0)
+        self.assertFalse(OSRelease.objects.filter(name__contains='EPEL').exists())
+
+    def test_epel_extracts_major_version_from_point_release(self):
+        """EPEL 10.1 should map to EL 10 OSReleases"""
+        rocky = OSRelease.objects.create(name='Rocky Linux 10')
+        collection = self._mock_collection()
+
+        add_updateinfo_osreleases(self.erratum, collection, ['Fedora EPEL 10.1'])
+
+        self.assertIn(rocky, self.erratum.osreleases.all())
+
+    def test_rocky_linux_extracts_major_version(self):
+        """rocky-linux-10.1 should create 'Rocky Linux 10' not '10.1'"""
+        collection = self._mock_collection()
+
+        add_updateinfo_osreleases(self.erratum, collection, ['rocky-linux-10.1'])
+
+        osrelease = self.erratum.osreleases.first()
+        self.assertEqual(osrelease.name, 'Rocky Linux 10')
+        self.assertFalse(OSRelease.objects.filter(name='Rocky Linux 10.1').exists())
+
+    def test_almalinux_extracts_major_version(self):
+        """almalinux-10.1 should create 'Alma Linux 10' not '10.1'"""
+        collection = self._mock_collection()
+
+        add_updateinfo_osreleases(self.erratum, collection, ['almalinux-10.1'])
+
+        osrelease = self.erratum.osreleases.first()
+        self.assertEqual(osrelease.name, 'Alma Linux 10')
+        self.assertFalse(OSRelease.objects.filter(name='Alma Linux 10.1').exists())
+
+    def test_amazon_linux_normalizes_name(self):
+        """Amazon Linux AMI should become Amazon Linux 1"""
+        collection = self._mock_collection()
+
+        add_updateinfo_osreleases(self.erratum, collection, ['Amazon Linux AMI'])
+
+        osrelease = self.erratum.osreleases.first()
+        self.assertEqual(osrelease.name, 'Amazon Linux 1')
+
+    def test_uses_collection_name_when_no_osrelease_names(self):
+        """Should use collection name when osrelease_names is empty"""
+        collection = self._mock_collection(name='Fedora 40')
+
+        add_updateinfo_osreleases(self.erratum, collection, [])
+
+        osrelease = self.erratum.osreleases.first()
+        self.assertEqual(osrelease.name, 'Fedora 40')

reports/utils.py

@@ -611,7 +611,9 @@ def get_os(os, arch):
         lts = ''
         if 'LTS' in os:
             lts = ' LTS'
-        major, minor, patch = os.split(' ')[1].split('.')
+        version_parts = os.split(' ')[1].split('.')
+        major = version_parts[0]
+        minor = version_parts[1] if len(version_parts) > 1 else '04'
         ubuntu_version = f'{major}_{minor}'
         osrelease_name = f'Ubuntu {major}.{minor}{lts}'
         cpe_name = f"cpe:2.3:o:canonical:ubuntu_linux:{ubuntu_version}:*:*:*:{'lts' if lts else '*'}:*:*:*"