Infrastructure/ansible
5
0
Fork 0
Code Issues Pull requests 3 Projects Releases Packages Wiki Activity Actions

epel7 retirement

Browse source 
Drop epel7 all the places in ansible where it is and makes sense.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi 2024-07-01 10:44:05 -07:00 • committed by kevin
parent 0000a57684
commit d11f9c5ced
14 changed files with 6 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

20
files/common/epel7.repo
View file

@ -1,20 +0,0 @@
[epel]
name=Extras Packages for Enterprise Linux $releasever - $basearch
baseurl=https://infrastructure.fedoraproject.org/pub/epel/7/$basearch/
enabled=1
gpgcheck=1
gpgkey=https://infrastructure.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7
[epel-testing]
name=Extras Packages for Enterprise Linux $releasever - $basearch
baseurl=https://infrastructure.fedoraproject.org/pub/epel/testing/7/$basearch/
enabled=0
gpgcheck=1
gpgkey=https://infrastructure.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7
[epel-beta]
name=Extras Packages for Enterprise Linux beta $releasever - $basearch
baseurl=https://infrastructure.fedoraproject.org/pub/epel/beta/7/$basearch/
enabled=0
gpgcheck=1
gpgkey=https://infrastructure.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7

24
files/common/original-epel7.repo
View file

@ -1,24 +0,0 @@
[epel]
name=Extra Packages for Enterprise Linux $releasever - $basearch
#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Everything/$basearch
metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch&infra=$infra&content=$contentdir
enabled=1
gpgcheck=1
countme=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7
[epel-debuginfo]
name=Extra Packages for Enterprise Linux $releasever - $basearch - Debug
#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Everything/$basearch/debug
metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir
enabled=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7
gpgcheck=1
[epel-source]
name=Extra Packages for Enterprise Linux $releasever - $basearch - Source
#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Everything/SRPMS
metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir
enabled=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7
gpgcheck=1

14
roles/bodhi2/backend/files/new-updates-sync
View file

@ -166,20 +166,6 @@ RELEASES = {'f40': {'topic': 'fedora',
'dest': os.path.join(EPELDEST, 'next', '8', 'Everything')}
]}}
},
'epel7': {'topic': 'epel',
'version': '7',
'modules': ['epel'],
'repos': {'epel-testing': {
'from': 'epel7-testing',
'to': [{'arches': ['x86_64', 'ppc64le', 'source'],
'dest': os.path.join(EPELDEST, 'testing', '7')}
]},
'epel': {
'from': 'epel7',
'to': [{'arches': ['x86_64', 'ppc64le', 'source'],
'dest': os.path.join(EPELDEST, '7')}
]}}
},
}

2
roles/bodhi2/backend/tasks/main.yml
View file

@ -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 f41 f40 f39 f39-flatpak epel9 epel9-next epel8 epel8-next epel7 module-package-list modular'"
job="/usr/local/bin/lock-wrapper owner-sync '/usr/local/bin/owner-sync-pagure f41 f40 f39 f39-flatpak epel9 epel9-next epel8'"
cron_file=update-koji-owner
user=apache
when: env == "production"

4
roles/bodhi2/backend/templates/koji_sync_listener.toml
View file

@ -48,10 +48,6 @@ taglist = [
"epel9",
"epel9-next",
"epel8",
"epel8-next",
"epel7",
"module-package-list",
"modular",
]
[qos]

1
roles/bodhi2/backend/templates/owner-sync-pagure.j2
View file

@ -12,7 +12,6 @@ This is heavily based on "owner-sync-pkgdb.j2" which was introduced in commit
# /usr/local/bin/owner-sync-pkgdb f19
# /usr/local/bin/owner-sync-pkgdb dist-5E-epel
# /usr/local/bin/owner-sync-pkgdb dist-6E-epel
# /usr/local/bin/owner-sync-pkgdb epel7
import sys
import os

4
roles/bodhi2/base/templates/production.ini.j2
View file

@ -238,10 +238,6 @@ container.source_registry = candidate-registry.stg.fedoraproject.org
{% if env == 'production' %}
fedora_stable_master_repomd = http://dl-iad05.fedoraproject.org/pub/fedora/linux/updates/%%s/Everything/%%s/repodata/repomd.xml
fedora_testing_master_repomd = http://dl-iad05.fedoraproject.org/pub/fedora/linux/updates/testing/%%s/Everything/%%s/repodata/repomd.xml
fedora_modular_stable_master_repomd = http://dl-iad05.fedoraproject.org/pub/fedora/linux/updates/%%s/Modular/%%s/repodata/repomd.xml
fedora_modular_testing_master_repomd = http://dl-iad05.fedoraproject.org/pub/fedora/linux/updates/testing/%%s/Modular/%%s/repodata/repomd.xml
fedora_epel_7_stable_master_repomd = http://dl-iad05.fedoraproject.org/pub/epel/%%s/%%s/repodata/repomd.xml
fedora_epel_7_testing_master_repomd = http://dl-iad05.fedoraproject.org/pub/epel/testing/%%s/%%s/repodata/repomd.xml
fedora_epel_stable_master_repomd = http://dl-iad05.fedoraproject.org/pub/epel/%%s/Everything/%%s/repodata/repomd.xml
fedora_epel_testing_master_repomd = http://dl-iad05.fedoraproject.org/pub/epel/testing/%%s/Everything/%%s/repodata/repomd.xml
fedora_epel_modular_stable_master_repomd = http://dl-iad05.fedoraproject.org/pub/epel/%%s/Modular/%%s/repodata/repomd.xml

2
roles/git/make_checkout_seed/files/make-git-checkout-seed.sh
View file

@ -21,7 +21,7 @@ SEED_DIR=$WORK_DIR/git-checkout
SPEC_DIR=$WORK_DIR/rpm-specs
# list of branches to make extra spec tarballs for
EXTRA_BRANCHES=("epel7" "epel8" "epel9")
EXTRA_BRANCHES=("epel8" "epel9")
EXTRA_BRANCHES_PREFIX=extra-rpm-specs-
# clear extra branches specs working directories

2
roles/haproxy/templates/haproxy.cfg
View file

@ -114,7 +114,7 @@ backend mirror-lists-backend
timeout connect 30s
server mirrorlist-local1 127.0.0.1:18081 check inter 1s rise 2 fall 3 weight 100
server mirrorlist-local2 127.0.0.1:18082 check inter 1s rise 2 fall 3 weight 100
option httpchk GET /metalink?repo=epel-7&arch=x86_64
option httpchk GET /metalink?repo=epel-9&arch=x86_64
option allbackups
frontend mirrormanager-frontend

5
roles/koji_hub/templates/hub.conf.j2
View file

@ -175,8 +175,8 @@ package_list =
# People with pkglist permission can manage package lists in
# active f$N and epel$N tags.
has_perm pkglist :: {
# Rawhide and epel7: adding, unblocking and blocking is allowed.
tag f{{FedoraRawhideNumber}} epel7 && match action add unblock block :: allow
# Rawhide adding, unblocking and blocking is allowed.
tag f{{FedoraRawhideNumber}} && match action add unblock block :: allow
# In branched blocking is allowed only before final freeze.
tag f{{FedoraBranchedNumber}} && match action add unblock {{ 'block' if not Frozen or FedoraBranchedBodhi != 'postbeta' else '' }} :: allow
# Stable releases: only adding and unblocking is allowed.
@ -203,7 +203,6 @@ sidetag =
tag epel9-build :: allow
tag epel8-next-build :: allow
tag epel8-build :: allow
tag epel7-build :: allow
all :: deny
{% if env == "staging" %}

2
roles/koji_hub/templates/prune-signed-copies-protected-tags.j2
View file

@ -14,7 +14,5 @@ f{{ FedoraPreviousPreviousCycleNumber }}-infra-stg
{% endif %}
epel8-infra
epel8-infra-stg
epel7-infra
epel7-infra-stg
coreos-pool
eln

7
roles/openshift-apps/toddlers/templates/fedora-messaging.toml
View file

@ -204,7 +204,7 @@ versions = []
[consumer_config.distgit_bugzilla_sync.products."Fedora EPEL"]
branch_regex = '^epel\d+$'
versions = ["epel9", "epel8", "epel7"]
versions = ["epel9", "epel8"]
# Configuration section for scm_request_processor
@ -261,11 +261,6 @@ stable_api = '2024-05-31'
security_fixes = '2024-05-31'
bug_fixes = '2024-05-31'
[consumer_config.scm_request_processor.branch_slas.epel7]
stable_api = '2024-06-30'
security_fixes = '2024-06-30'
bug_fixes = '2024-06-30'
[consumer_config.scm_request_processor.branch_slas.f40]
bug_fixes = '2025-05-13'
security_fixes = '2025-05-13'

6
roles/packages3/web/files/distmappings.py
View file

@ -71,12 +71,6 @@ tags = ({'name': 'Rawhide', 'tag': 'f41'},
{'name': 'EPEL 8 Testing', 'tag': 'epel8-testing'},
{'name': 'EPEL 8 Staging', 'tag': 'epel8-staging'},
{'name': 'EPEL 7', 'tag': 'epel7'},
{'name': 'EPEL 7 Testing', 'tag': 'epel7-testing'},
{'name': 'EPEL 6', 'tag': 'dist-6E-epel'},
{'name': 'EPEL 6 Testing', 'tag': 'dist-6E-epel-testing'},
)
tags_to_name_map = {}

18
roles/robosignatory/templates/robosignatory.toml.j2
View file

@ -94,12 +94,6 @@ handlers = ["console"]
# Infra tags
[[consumer_config.koji_instances.primary.tags]]
from = "epel7-infra-candidate"
to = "epel7-infra-stg"
key = "{{ (env == 'production')|ternary('fedora-infra', 'testkey') }}"
keyid = "{{ (env == 'production')|ternary('47dd8ef9', 'd300e724') }}"
[[consumer_config.koji_instances.primary.tags]]
from = "epel8-infra-candidate"
to = "epel8-infra-stg"
@ -281,18 +275,6 @@ handlers = ["console"]
key = "{{ (env == 'production')|ternary('epel-8', 'testkey') }}"
keyid = "{{ (env == 'production')|ternary('2f86d6a1', 'd300e724') }}"
[[consumer_config.koji_instances.primary.tags]]
from = "epel7-signing-pending"
to = "epel7-testing-pending"
key = "{{ (env == 'production')|ternary('epel-7', 'testkey') }}"
keyid = "{{ (env == 'production')|ternary('352c64e5', 'd300e724') }}"
[consumer_config.koji_instances.primary.tags.sidetags]
pattern = 'epel7-build-side-<seq_id>'
from = '<sidetag>-signing-pending'
to = '<sidetag>-testing-pending'
trusted_taggers = ['bodhi']
# ELN signing
[[consumer_config.koji_instances.primary.tags]]