From 2e3eaabb1c3227cd75d332978cbf68b0637c4a38 Mon Sep 17 00:00:00 2001 From: Carl George Date: Thu, 13 Feb 2025 20:55:15 -0600 Subject: [PATCH] Branch epel10.0 from epel10 Signed-off-by: Carl George --- roles/batcave/files/centos-10-sync | 2 +- roles/bodhi2/backend/files/new-updates-sync | 18 ++++++++++++++++-- roles/bodhi2/backend/tasks/main.yml | 2 +- .../backend/templates/koji_sync_listener.toml | 1 + roles/koji_hub/templates/hub.conf.j2 | 3 ++- .../templates/robosignatory.toml.j2 | 12 ++++++++++++ 6 files changed, 33 insertions(+), 5 deletions(-) diff --git a/roles/batcave/files/centos-10-sync b/roles/batcave/files/centos-10-sync index af3255aff7..2a31480262 100644 --- a/roles/batcave/files/centos-10-sync +++ b/roles/batcave/files/centos-10-sync @@ -23,4 +23,4 @@ ${RSYNC} ${RS_OPT} ${RS_DEADLY} ${CENT_EXCLUDES} ${SERVER}::${RSYNC_MOD} ${RSYNC # resembles RHEL 10.0 for the epel10.0-build tag to use temporarily until the # actual RHEL 10.0 is released. # https://pagure.io/fedora-infrastructure/issue/12394 -${RSYNC} ${RS_OPT} ${RS_DEADLY} --link-dest=${RSYNC_DESTDIR} ${RSYNC_DESTDIR} ${RSYNC_SNAPDIR} +#${RSYNC} ${RS_OPT} ${RS_DEADLY} --link-dest=${RSYNC_DESTDIR} ${RSYNC_DESTDIR} ${RSYNC_SNAPDIR} diff --git a/roles/bodhi2/backend/files/new-updates-sync b/roles/bodhi2/backend/files/new-updates-sync index c3e67e8537..bfaeac8b8e 100755 --- a/roles/bodhi2/backend/files/new-updates-sync +++ b/roles/bodhi2/backend/files/new-updates-sync @@ -152,18 +152,32 @@ RELEASES = {'f42': {'topic': 'fedora', 'dest': os.path.join(FEDORAALTDEST, 'testing', '40', 'Everything')} ]}} }, + 'epel10.1': {'topic': 'epel', + 'version': '10.1', + 'modules': ['epel'], + 'repos': {'epel': { + 'from': 'epel10.1', + 'to': [{'arches': ['x86_64', 'aarch64', 'ppc64le', 's390x', 'source'], + 'dest': os.path.join(EPELDEST, '10', 'Everything')}, + ]}, + 'epel-testing': { + 'from': 'epel10.1-testing', + 'to': [{'arches': ['x86_64', 'aarch64', 'ppc64le', 's390x', 'source'], + 'dest': os.path.join(EPELDEST, 'testing', '10', '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')}, + 'dest': os.path.join(EPELDEST, '10.0', 'Everything')}, ]}, 'epel-testing': { 'from': 'epel10.0-testing', 'to': [{'arches': ['x86_64', 'aarch64', 'ppc64le', 's390x', 'source'], - 'dest': os.path.join(EPELDEST, 'testing', '10', 'Everything')}, + 'dest': os.path.join(EPELDEST, 'testing', '10.0', 'Everything')}, ]}} }, 'epel9': {'topic': 'epel', diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml index a98b37a07f..c3a1dea6b4 100644 --- a/roles/bodhi2/backend/tasks/main.yml +++ b/roles/bodhi2/backend/tasks/main.yml @@ -116,7 +116,7 @@ # bodhi2/backend/files/koji_sync_listener.py # This cronjob runs only once a day. The listener script runs reactively. cron: name="owner-sync" minute="15" hour="4" user="root" - job="/usr/local/bin/lock-wrapper owner-sync '/usr/local/bin/owner-sync-pagure f43 f42 f41 f40 epel10.0 epel9 epel9-next epel8'" + job="/usr/local/bin/lock-wrapper owner-sync '/usr/local/bin/owner-sync-pagure f43 f42 f41 f40 epel10.1 epel10.0 epel9 epel9-next epel8'" cron_file=update-koji-owner user=apache when: env == "production" diff --git a/roles/bodhi2/backend/templates/koji_sync_listener.toml b/roles/bodhi2/backend/templates/koji_sync_listener.toml index 5ea7657d43..7937965a07 100644 --- a/roles/bodhi2/backend/templates/koji_sync_listener.toml +++ b/roles/bodhi2/backend/templates/koji_sync_listener.toml @@ -51,6 +51,7 @@ taglist = [ "f39", "f39-container", "f39-flatpak", + "epel10.1", "epel10.0", "epel9", "epel9-next", diff --git a/roles/koji_hub/templates/hub.conf.j2 b/roles/koji_hub/templates/hub.conf.j2 index 00c998c4c4..a34775c244 100644 --- a/roles/koji_hub/templates/hub.conf.j2 +++ b/roles/koji_hub/templates/hub.conf.j2 @@ -211,7 +211,7 @@ package_list = # Stable releases: only adding and unblocking is allowed. tag f{{FedoraCycleNumber}} f{{FedoraPreviousCycleNumber}} && match action add unblock :: allow # EPEL: adding, blocking, and unblocking are allowed - tag epel8 epel9 epel9-next epel10.0 && match action add unblock block :: allow + tag epel8 epel9 epel9-next epel10.0 epel10.1 && match action add unblock block :: allow } # Infra people can themselves add/block/unblock packages in their # tags without bothering admins. @@ -232,6 +232,7 @@ sidetag = tag f40-build :: allow tag f39-build :: allow tag eln-build :: allow + tag epel10.1-build :: allow tag epel10.0-build :: allow tag epel9-next-build :: allow tag epel9-build :: allow diff --git a/roles/robosignatory/templates/robosignatory.toml.j2 b/roles/robosignatory/templates/robosignatory.toml.j2 index db037f09f0..6694b90411 100644 --- a/roles/robosignatory/templates/robosignatory.toml.j2 +++ b/roles/robosignatory/templates/robosignatory.toml.j2 @@ -255,6 +255,18 @@ handlers = ["console"] # Gated bodhi updates + [[consumer_config.koji_instances.primary.tags]] + from = "epel10.1-signing-pending" + to = "epel10.1-testing-pending" + key = "{{ (env == 'production')|ternary('epel-10', 'testkey') }}" + keyid = "{{ (env == 'production')|ternary('e37ed158', 'd300e724') }}" + + [consumer_config.koji_instances.primary.tags.sidetags] + pattern = 'epel10.1-build-side-' + from = '-signing-pending' + to = '-testing-pending' + trusted_taggers = ['bodhi'] + [[consumer_config.koji_instances.primary.tags]] from = "epel10.0-signing-pending" to = "epel10.0-testing-pending"