From 5ae79fa8505525006364af9364f891692f924b95 Mon Sep 17 00:00:00 2001 From: Carl George Date: Jan 21 2021 11:28:51 +0000 Subject: Add support for epel8-next - add branch SLAs - add pkg_cs8.json check in valid_epel_package function --- diff --git a/fedscm_admin/__init__.py b/fedscm_admin/__init__.py index ccfa760..38cc6a1 100644 --- a/fedscm_admin/__init__.py +++ b/fedscm_admin/__init__.py @@ -44,6 +44,11 @@ STANDARD_BRANCH_SLAS = { 'security_fixes': '2029-05-31', 'bug_fixes': '2029-05-31' }, + 'epel8-next': { + 'stable_api': '2024-05-31', + 'security_fixes': '2024-05-31', + 'bug_fixes': '2024-05-31' + }, 'epel7': { 'stable_api': '2024-06-30', 'security_fixes': '2024-06-30', diff --git a/fedscm_admin/utils.py b/fedscm_admin/utils.py index d178033..067695f 100644 --- a/fedscm_admin/utils.py +++ b/fedscm_admin/utils.py @@ -738,8 +738,10 @@ def valid_epel_package(name, branch): """ # Extract any digits in the branch name to determine the EL version version = ''.join([i for i in branch if re.match(r'\d', i)]) - url = ('https://infrastructure.fedoraproject.org/repo/json/pkg_el{0}.json' - .format(version)) + if branch.endswith('-next'): + url = f'https://infrastructure.fedoraproject.org/repo/json/pkg_cs{version}.json' + else: + url = f'https://infrastructure.fedoraproject.org/repo/json/pkg_el{version}.json' rv = requests_wrapper( url, timeout=60, service_name='infrastructure.fedoraproject.org') rv_json = get_request_json(rv, 'getting the list of official EL packages')