From 9577c2d9a604fc878d24cd759c373bdf532dd3b6 Mon Sep 17 00:00:00 2001
From: Carl George <carlwgeorge@gmail.com>
Date: Tue, 5 Nov 2024 01:53:57 -0600
Subject: [PATCH] Switch EPEL 10 to bodhi composes

- disable nightly compose cron job
- disable mandatory_days_in_testing override
- revert bugzilla exclusion
- add epel10.0 to new-updates-sync

When this is merged, we'll also need to change the following settings in
the EPEL-10.0 bodhi release:

- state: current
- composed-by-bodhi: true
- create-automatic-updates: false

https://pagure.io/epel/issue/300

Signed-off-by: Carl George <carlwgeorge@gmail.com>
---
 roles/bodhi2/backend/files/new-updates-sync      | 14 ++++++++++++++
 roles/bodhi2/backend/templates/pungi.rpm.conf.j2 | 12 +++++++++++-
 roles/bodhi2/base/templates/production.ini.j2    |  7 +------
 roles/releng/files/epel10                        |  3 ---
 roles/releng/tasks/main.yml                      |  8 --------
 5 files changed, 26 insertions(+), 18 deletions(-)
 delete mode 100644 roles/releng/files/epel10

diff --git a/roles/bodhi2/backend/files/new-updates-sync b/roles/bodhi2/backend/files/new-updates-sync
index 67680aa129..78a8ae7519 100755
--- a/roles/bodhi2/backend/files/new-updates-sync
+++ b/roles/bodhi2/backend/files/new-updates-sync
@@ -152,6 +152,20 @@ RELEASES = {'f41': {'topic': 'fedora',
                                 'dest': os.path.join(FEDORAALTDEST, 'testing', '39', 'Everything')}
                               ]}}
                    },
+            'epel10.0': {'topic': 'epel',
+                         'version': '10.0',
+                         'modules': ['epel'],
+                         'repos': {'epel': {
+                             'from': 'epel10.0',
+                             'to': [{'arches': ['x86_64', 'aarch64', 'ppc64le', 's390x', 'source'],
+                                     'dest': os.path.join(EPELDEST, '10', 'Everything')},
+                                   ]},
+                                   'epel-testing': {
+                             'from': 'epel10.0-testing',
+                             'to': [{'arches': ['x86_64', 'aarch64', 'ppc64le', 's390x', 'source'],
+                                     'dest': os.path.join(EPELDEST, 'testing', '10', 'Everything')},
+                                   ]}}
+                        },
             'epel9': {'topic': 'epel',
                       'version': '9',
                       'modules': ['epel'],
diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
index 9482ab63e7..9039598c84 100644
--- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
+++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
@@ -8,8 +8,18 @@ skip_phases = ["buildinstall", "extra_files"]
 release_version = '[[ release.version ]]'
 release_type = 'updates[% if request.name == 'testing' %]-testing[% endif %]'
 old_composes_per_release_type = True
+[% if release.id_prefix == 'FEDORA-EPEL' %]
+[% if release.version == '8' or release.version == '9' %]
+release_name = 'Fedora-Epel'
+release_short = 'Fedora-Epel'
+[% else %]
+release_name = 'Fedora-EPEL'
+release_short = 'Fedora-EPEL'
+[% endif %]
+[% else %]
 release_name = '[[ release.id_prefix.title() ]]'
 release_short = '[[ release.id_prefix.title() ]]'
+[% endif %]
 
 # GENERAL SETTINGS
 comps_file = {
@@ -39,7 +49,7 @@ sigkeys = [
     '2f86d6a1'
 [% elif release.version == '9' %]
     '3228467c',
-[% elif release.version.startswith("10") %]
+[% elif release.version == '10' or release.version.startswith('10.') %]
     'e37ed158',
 [% endif %]
 {% if env == "staging" %}
diff --git a/roles/bodhi2/base/templates/production.ini.j2 b/roles/bodhi2/base/templates/production.ini.j2
index 23ddc3f9a4..ac47dfaafa 100644
--- a/roles/bodhi2/base/templates/production.ini.j2
+++ b/roles/bodhi2/base/templates/production.ini.j2
@@ -506,7 +506,7 @@ bz_products = Fedora,Fedora EPEL,Fedora Modules
 
 # Exclude some Releases where Updates are created automatically to touch bugs.
 # Comma separated list of Release.name values
-bz_exclude_rels = ELN,EPEL-10.0
+bz_exclude_rels = ELN
 
 # Relax default regex used to catch bug ids in RPM changelogs
 bz_regex = (?:fedora|epel|rh(?:bz)?)#(\d{5,})
@@ -602,11 +602,6 @@ eln.status = pre_beta
 eln.pre_beta.mandatory_days_in_testing = 0
 eln.pre_beta.critpath.mandatory_days_in_testing = 0
 
-# EPEL bootstrap - During bootstrap updates don't require any days in testing.
-epel{{ EPELBootstrapNumber }}.status = pre_beta
-epel{{ EPELBootstrapNumber }}.pre_beta.mandatory_days_in_testing = 0
-
-
 ##
 ## Buildroot Override
 ##
diff --git a/roles/releng/files/epel10 b/roles/releng/files/epel10
deleted file mode 100644
index 2a5a8ec81d..0000000000
--- a/roles/releng/files/epel10
+++ /dev/null
@@ -1,3 +0,0 @@
-# epel10 compose
-MAILTO=releng-cron@lists.fedoraproject.org
-15 3 * * * root touch /tmp/fedora-compose-epel10 && TMPDIR=`mktemp -d /tmp/epel10.XXXXXX` && chmod 755 $TMPDIR && cd $TMPDIR && git clone --depth 1 --branch epel10 https://pagure.io/pungi-fedora.git && cd pungi-fedora && /usr/local/bin/lock-wrapper epel10-compose "LANG=en_US.UTF-8 ./nightly.sh" && sudo -u ftpsync /usr/local/bin/update-fullfiletimelist -l /pub/fedora-secondary/update-fullfiletimelist.lock -t /pub epel && rm /tmp/fedora-compose-epel10
diff --git a/roles/releng/tasks/main.yml b/roles/releng/tasks/main.yml
index 8c8fbb5283..4b8c285f65 100644
--- a/roles/releng/tasks/main.yml
+++ b/roles/releng/tasks/main.yml
@@ -346,14 +346,6 @@
     mode: "644"
   when: inventory_hostname.startswith('compose-iot01.iad2')
 
-# put cron job in for epel10 compose
-- name: EPEL 10 compose cron
-  ansible.builtin.copy:
-    src: epel10
-    dest: /etc/cron.d/epel10
-    mode: "644"
-  when: inventory_hostname.startswith('compose-rawhide01.iad2')
-
 # put cron job in for ELN compose
 - name: ELN compose cron
   ansible.builtin.copy: