From cbdabd149ec688738f572af2a9f0f33c105892b6 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Fri, 6 Sep 2024 13:42:30 -0700
Subject: [PATCH] Revert "releng / bodhi: switch epel10 compose to nightly cron
 job"

This reverts commit 566769ded73f2580da1b5a54e4eb69402d3e7e1f.

We need to revert this in order to push updates that are pending testing
and stable, then will switch it back.
---
 roles/bodhi2/backend/files/new-updates-sync   | 14 ++++++++++++++
 roles/bodhi2/base/templates/production.ini.j2 |  3 +++
 roles/releng/files/epel10                     |  3 ---
 roles/releng/tasks/main.yml                   |  5 -----
 4 files changed, 17 insertions(+), 8 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 ad70b00602..7f11cce369 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/base/templates/production.ini.j2 b/roles/bodhi2/base/templates/production.ini.j2
index 77972ba1b1..4be6890351 100644
--- a/roles/bodhi2/base/templates/production.ini.j2
+++ b/roles/bodhi2/base/templates/production.ini.j2
@@ -249,6 +249,9 @@ fedora_stable_master_repomd = https://kojipkgs.stg.fedoraproject.org/compose/upd
 fedora_testing_master_repomd = https://kojipkgs.stg.fedoraproject.org/compose/updates/f%%s-updates-testing/compose/Everything/%%s/os/repodata/repomd.xml
 fedora_epel_stable_master_repomd = http://dl-iad05.fedoraproject.org/pub/epel/%%s/%%s/repodata/repomd.xml
 fedora_epel_testing_master_repomd = http://dl-iad05.fedoraproject.org/pub/epel/testing/%%s/%%s/repodata/repomd.xml
+# the latest EPEL 10 minor version needs an override to use 10 in the path instead of 10.x
+fedora_epel_10.0_stable_master_repomd = http://dl-iad05.fedoraproject.org/pub/epel/10/Everything/%%s/repodata/repomd.xml
+fedora_epel_10.0_testing_master_repomd = http://dl-iad05.fedoraproject.org/pub/epel/testing/10/Everything/%%s/repodata/repomd.xml
 fedora_modular_stable_master_repomd = https://kojipkgs.stg.fedoraproject.org/compose/updates/f%%s-modular-updates/compose/Everything/%%s/os/repodata/repomd.xml
 fedora_modular_testing_master_repomd = https://kojipkgs.stg.fedoraproject.org/compose/updates/f%%s-modular-updates-testing/compose/Everything/%%s/os/repodata/repomd.xml
 {% endif %}
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 bf7ed6d813..a28011e60f 100644
--- a/roles/releng/tasks/main.yml
+++ b/roles/releng/tasks/main.yml
@@ -218,11 +218,6 @@
   copy: src="rawhide-iot" dest=/etc/cron.d/rawhide-iot
   when: inventory_hostname.startswith('compose-iot-01.iad2')
 
-# put cron job in for epel10 compose
-- name: epel10 compose cron
-  copy: src="epel10" dest=/etc/cron.d/epel10
-  when: inventory_hostname.startswith('compose-rawhide01.iad2')
-
 # put cron job in for enforcing FESCo SIG Policy
 # https://docs.fedoraproject.org/en-US/fesco/SIG_policy/
 - name: sig_policy cron