From dd88961a99a9eedcb2ca9e8bb612456b22b439fd Mon Sep 17 00:00:00 2001
From: Dmitry Marakasov <amdmi3@amdmi3.ru>
Date: Mon, 2 Sep 2024 22:05:11 +0300
Subject: [PATCH] Update configs fir EPEL repos

- Merge configs into single template
- Add EoL dates
- Add EPEL 10
- Fix URL for (now archived) EPEL 7
---
 repos.d/rpm/epel.yaml | 62 +++++++++++++++++--------------------------
 1 file changed, 24 insertions(+), 38 deletions(-)

diff --git a/repos.d/rpm/epel.yaml b/repos.d/rpm/epel.yaml
index d07530904..48cc2185f 100644
--- a/repos.d/rpm/epel.yaml
+++ b/repos.d/rpm/epel.yaml
@@ -1,20 +1,29 @@
 ###########################################################################
 # EPEL
 ###########################################################################
-- name: epel_6
+{% macro epel(version, minpackages, subdir, valid_till=None, archived=False) %}
+{% set sortversion = '0' + (version|string) if version < 10 else version %}
+- name: epel_{{version}}
+  sortname: epel_{{sortversion}}
   type: repository
-  desc: EPEL 6
+  desc: EPEL {{version}}
   statsgroup: EPEL
   family: fedora
   ruleset: [fedora, rpm, epel]
   color: 'ff0000'
-  minpackages: 5000
-  valid_till: 2020-11-30
+  minpackages: {{minpackages}}
+  {% if valid_till %}
+  valid_till: {{valid_till}}
+  {% endif %}
   sources:
     - name: data
       fetcher:
         class: RepodataFetcher
-        url: https://archives.fedoraproject.org/pub/archive/epel/6/SRPMS/
+        {% if archived %}
+        url: https://archives.fedoraproject.org/pub/archive/epel/{{version}}/{{subdir}}/
+        {% else %}
+        url: https://dl.fedoraproject.org/pub/epel/{{version}}/{{subdir}}/
+        {% endif %}
       parser:
         class: RepodataParser
         vertags: el
@@ -22,42 +31,14 @@
     - desc: EPEL wiki page
       url: https://fedoraproject.org/wiki/EPEL
   packagelinks:
+    {% if version == 6 %}
     - type: PACKAGE_SOURCES
       url: 'https://src.fedoraproject.org/rpms/{srcname}/tree/el6'
     - type: PACKAGE_RECIPE
       url: 'https://src.fedoraproject.org/rpms/{srcname}/blob/el6/f/{srcname}.spec'
     - type: PACKAGE_RECIPE_RAW
       url: 'https://src.fedoraproject.org/rpms/{srcname}/raw/el6/f/{srcname}.spec'
-    # could be more specific, but we need binname(s) for that
-    # see https://github.com/repology/repology-updater/issues/1274
-    # see the same for fedora
-    #- type: PACKAGE_BUILD_LOG
-    #  url: 'https://kojipkgs.fedoraproject.org/packages/{srcname}/{rpmversion}/{rpmrelease}/data/logs/{arch}/build.log'
-    - type: PACKAGE_BUILD_LOGS
-      url: 'https://kojipkgs.fedoraproject.org/packages/{srcname}/{rpmversion}/{rpmrelease}/data/logs/'
-  groups: [ all, production, epel ]
-
-{% macro epel(version, minpackages, subdir) %}
-- name: epel_{{version}}
-  type: repository
-  desc: EPEL {{version}}
-  statsgroup: EPEL
-  family: fedora
-  ruleset: [fedora, rpm, epel]
-  color: 'ff0000'
-  minpackages: {{minpackages}}
-  sources:
-    - name: data
-      fetcher:
-        class: RepodataFetcher
-        url: https://dl.fedoraproject.org/pub/epel/{{version}}/{{subdir}}/
-      parser:
-        class: RepodataParser
-        vertags: el
-  repolinks:
-    - desc: EPEL wiki page
-      url: https://fedoraproject.org/wiki/EPEL
-  packagelinks:
+    {% else %}
     - type: PACKAGE_HOMEPAGE
       url: 'https://packages.fedoraproject.org/pkgs/{srcname}/'
     - type: PACKAGE_SOURCES
@@ -66,6 +47,7 @@
       url: 'https://src.fedoraproject.org/rpms/{srcname}/blob/epel{{version}}/f/{srcname}.spec'
     - type: PACKAGE_RECIPE_RAW
       url: 'https://src.fedoraproject.org/rpms/{srcname}/raw/epel{{version}}/f/{srcname}.spec'
+    {% endif %}
     # could be more specific, but we need binname(s) for that
     # see https://github.com/repology/repology-updater/issues/1274
     # see the same for fedora
@@ -76,6 +58,10 @@
   groups: [ all, production, epel ]
 {% endmacro %}
 
-{{ epel(7, minpackages=7000, subdir="SRPMS") }}
-{{ epel(8, minpackages=4000, subdir="Everything/SRPMS") }}
-{{ epel(9, minpackages=300, subdir="Everything/source/tree") }}
+# EoLs assumed to be based on corresponding RHEL releases
+# https://en.wikipedia.org/wiki/Red_Hat_Enterprise_Linux#Product_life_cycle
+{{ epel(6, minpackages=5000, subdir="SRPMS",                  valid_till="2020-11-30", archived=True) }}
+{{ epel(7, minpackages=7000, subdir="SRPMS",                  valid_till="2024-06-30", archived=True) }}
+{{ epel(8, minpackages=5000, subdir="Everything/SRPMS",       valid_till="2029-05-31") }}
+{{ epel(9, minpackages=7000, subdir="Everything/source/tree", valid_till="2032-05-31") }}
+{{ epel(10, minpackages=700, subdir="Everything/source/tree") }}