4806771410

Build Type

push

github

Committed by Lukas Holecek

Commit Message

Allow to use multiple product versions

Run Details

580 of 692 branches covered (83.82%)

Branch coverage included in aggregate %.

47 of 48 new or added lines in 4 files covered. (97.92%)

6 existing lines in 1 file now uncovered.

1771 of 2024 relevant lines covered (87.5%)

0.88 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

89.47

/greenwave/product_versions.py

# SPDX-License-Identifier: GPL-2.0+
"""
Product version guessing for subject identifiers
"""

import logging
import re
import socket

from defusedxml.xmlrpc import xmlrpc_client
from werkzeug.exceptions import NotFound

from greenwave.resources import (
    retrieve_koji_build_target,
    retrieve_koji_build_task_id,
)

log = logging.getLogger(__name__)

# Capture major and minor product versions from Brew build tags,
# for example: rhel-9, rhel-9.1
RHEL_MAJOR_MINOR = re.compile(r'((rhel-\d+)(?:.\d+)?)')


def _guess_product_versions(toparse, koji_build=False) -> list[str]:
    if toparse == 'rawhide' or toparse.startswith('Fedora-Rawhide'):
        return ['fedora-rawhide']

    m = RHEL_MAJOR_MINOR.match(toparse)
    if m:
        return list(m.groups())

    product_version = None
    if toparse.startswith('f') and koji_build:
        product_version = 'fedora-'
    elif toparse.startswith('epel'):
        product_version = 'epel-'
    elif toparse.startswith('el') and len(toparse) > 2 and toparse[2].isdigit():
        product_version = 'rhel-'
    elif toparse.startswith('fc') or toparse.startswith('Fedora'):
        product_version = 'fedora-'

    if product_version:
        # seperate the prefix from the number
        result = list(filter(None, '-'.join(re.split(r'(\d+)', toparse)).split('-')))
        if len(result) >= 2:
            try:
                int(result[1])
                product_version += result[1]
                return [product_version]
            except ValueError:
                pass

    log.warning("Failed to guess the product version for %s", toparse)
    return []


def _guess_koji_build_product_versions(
        subject_identifier, koji_base_url, koji_task_id=None) -> list[str]:
    try:
        if not koji_task_id:
            try:
                koji_task_id = retrieve_koji_build_task_id(
                    subject_identifier, koji_base_url
                )
            except NotFound:
                koji_task_id = None

            if not koji_task_id:
                return []

        target = retrieve_koji_build_target(koji_task_id, koji_base_url)
        if target:
            return _guess_product_versions(target, koji_build=True)

        return []
    except (xmlrpc_client.ProtocolError, socket.error) as err:
        raise ConnectionError('Could not reach Koji: {}'.format(err))
    except xmlrpc_client.Fault:
        log.exception('Unexpected Koji XML RPC fault')
        return []


def subject_product_versions(
        subject,
        koji_base_url=None,
        koji_task_id=None) -> list[str]:
    if subject.product_versions:
        return subject.product_versions

    if koji_base_url and subject.is_koji_build:
        pvs = _guess_koji_build_product_versions(
            subject.identifier, koji_base_url, koji_task_id)
        if pvs:
            return pvs

    if subject.short_product_version:
        return _guess_product_versions(
            subject.short_product_version, koji_build=subject.is_koji_build)

    return []

1	# SPDX-License-Identifier: GPL-2.0+
2	"""	1✔
3	Product version guessing for subject identifiers
4	"""
5
6	import logging	1✔
7	import re	1✔
8	import socket	1✔
9
10	from defusedxml.xmlrpc import xmlrpc_client	1✔
11	from werkzeug.exceptions import NotFound	1✔
12
13	from greenwave.resources import (	1✔
14	retrieve_koji_build_target,
15	retrieve_koji_build_task_id,
16	)
17
18	log = logging.getLogger(__name__)	1✔
19
20	# Capture major and minor product versions from Brew build tags,
21	# for example: rhel-9, rhel-9.1
22	RHEL_MAJOR_MINOR = re.compile(r'((rhel-\d+)(?:.\d+)?)')	1✔
23
24
25	def _guess_product_versions(toparse, koji_build=False) -> list[str]:	1✔
26	if toparse == 'rawhide' or toparse.startswith('Fedora-Rawhide'):	1✔
27	return ['fedora-rawhide']	1✔
28
29	m = RHEL_MAJOR_MINOR.match(toparse)	1✔
30	if m:	1✔
31	return list(m.groups())	1✔
32
33	product_version = None	1✔
34	if toparse.startswith('f') and koji_build:	1✔
35	product_version = 'fedora-'	1✔
36	elif toparse.startswith('epel'):	1✔
37	product_version = 'epel-'	1✔
38	elif toparse.startswith('el') and len(toparse) > 2 and toparse[2].isdigit():	1✔
39	product_version = 'rhel-'	1✔
40	elif toparse.startswith('fc') or toparse.startswith('Fedora'):	1!
UNCOV 41	product_version = 'fedora-'	×
42
43	if product_version:	1✔
44	# seperate the prefix from the number
45	result = list(filter(None, '-'.join(re.split(r'(\d+)', toparse)).split('-')))	1✔
46	if len(result) >= 2:	1!
47	try:	1✔
48	int(result[1])	1✔
49	product_version += result[1]	1✔
50	return [product_version]	1✔
UNCOV 51	except ValueError:	×
UNCOV 52	pass	×
53
54	log.warning("Failed to guess the product version for %s", toparse)	1✔
55	return []	1✔
56
57
58	def _guess_koji_build_product_versions(	1✔
59	subject_identifier, koji_base_url, koji_task_id=None) -> list[str]:
60	try:	1✔
61	if not koji_task_id:	1✔
62	try:	1✔
63	koji_task_id = retrieve_koji_build_task_id(	1✔
64	subject_identifier, koji_base_url
65	)
66	except NotFound:	1✔
UNCOV 67	koji_task_id = None	×
68
69	if not koji_task_id:	1✔
70	return []	1✔
71
72	target = retrieve_koji_build_target(koji_task_id, koji_base_url)	1✔
73	if target:	1✔
74	return _guess_product_versions(target, koji_build=True)	1✔
75
76	return []	1✔
77	except (xmlrpc_client.ProtocolError, socket.error) as err:	1!
78	raise ConnectionError('Could not reach Koji: {}'.format(err))	1✔
UNCOV 79	except xmlrpc_client.Fault:	×
UNCOV 80	log.exception('Unexpected Koji XML RPC fault')	×
NEW 81	return []	×
82
83
84	def subject_product_versions(	1✔
85	subject,
86	koji_base_url=None,
87	koji_task_id=None) -> list[str]:
88	if subject.product_versions:	1✔
89	return subject.product_versions	1✔
90
91	if koji_base_url and subject.is_koji_build:	1✔
92	pvs = _guess_koji_build_product_versions(	1✔
93	subject.identifier, koji_base_url, koji_task_id)
94	if pvs:	1✔
95	return pvs	1✔
96
97	if subject.short_product_version:	1✔
98	return _guess_product_versions(	1✔
99	subject.short_product_version, koji_build=subject.is_koji_build)
100
101	return []	1✔

release-engineering / greenwave / 4806771410

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous