epel7 retirement
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:
parent
0000a57684
commit
d11f9c5ced
14 changed files with 6 additions and 105 deletions
|
@ -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
|
|
|
@ -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
|
|
|
@ -166,20 +166,6 @@ RELEASES = {'f40': {'topic': 'fedora',
|
||||||
'dest': os.path.join(EPELDEST, 'next', '8', 'Everything')}
|
'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')}
|
|
||||||
]}}
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -116,7 +116,7 @@
|
||||||
# bodhi2/backend/files/koji_sync_listener.py
|
# bodhi2/backend/files/koji_sync_listener.py
|
||||||
# This cronjob runs only once a day. The listener script runs reactively.
|
# This cronjob runs only once a day. The listener script runs reactively.
|
||||||
cron: name="owner-sync" minute="15" hour="4" user="root"
|
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
|
cron_file=update-koji-owner
|
||||||
user=apache
|
user=apache
|
||||||
when: env == "production"
|
when: env == "production"
|
||||||
|
|
|
@ -48,10 +48,6 @@ taglist = [
|
||||||
"epel9",
|
"epel9",
|
||||||
"epel9-next",
|
"epel9-next",
|
||||||
"epel8",
|
"epel8",
|
||||||
"epel8-next",
|
|
||||||
"epel7",
|
|
||||||
"module-package-list",
|
|
||||||
"modular",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[qos]
|
[qos]
|
||||||
|
|
|
@ -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 f19
|
||||||
# /usr/local/bin/owner-sync-pkgdb dist-5E-epel
|
# /usr/local/bin/owner-sync-pkgdb dist-5E-epel
|
||||||
# /usr/local/bin/owner-sync-pkgdb dist-6E-epel
|
# /usr/local/bin/owner-sync-pkgdb dist-6E-epel
|
||||||
# /usr/local/bin/owner-sync-pkgdb epel7
|
|
||||||
|
|
||||||
import sys
|
import sys
|
||||||
import os
|
import os
|
||||||
|
|
|
@ -238,10 +238,6 @@ container.source_registry = candidate-registry.stg.fedoraproject.org
|
||||||
{% if env == 'production' %}
|
{% if env == 'production' %}
|
||||||
fedora_stable_master_repomd = http://dl-iad05.fedoraproject.org/pub/fedora/linux/updates/%%s/Everything/%%s/repodata/repomd.xml
|
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_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_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_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
|
fedora_epel_modular_stable_master_repomd = http://dl-iad05.fedoraproject.org/pub/epel/%%s/Modular/%%s/repodata/repomd.xml
|
||||||
|
|
|
@ -21,7 +21,7 @@ SEED_DIR=$WORK_DIR/git-checkout
|
||||||
SPEC_DIR=$WORK_DIR/rpm-specs
|
SPEC_DIR=$WORK_DIR/rpm-specs
|
||||||
|
|
||||||
# list of branches to make extra spec tarballs for
|
# list of branches to make extra spec tarballs for
|
||||||
EXTRA_BRANCHES=("epel7" "epel8" "epel9")
|
EXTRA_BRANCHES=("epel8" "epel9")
|
||||||
EXTRA_BRANCHES_PREFIX=extra-rpm-specs-
|
EXTRA_BRANCHES_PREFIX=extra-rpm-specs-
|
||||||
|
|
||||||
# clear extra branches specs working directories
|
# clear extra branches specs working directories
|
||||||
|
|
|
@ -114,7 +114,7 @@ backend mirror-lists-backend
|
||||||
timeout connect 30s
|
timeout connect 30s
|
||||||
server mirrorlist-local1 127.0.0.1:18081 check inter 1s rise 2 fall 3 weight 100
|
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
|
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
|
option allbackups
|
||||||
|
|
||||||
frontend mirrormanager-frontend
|
frontend mirrormanager-frontend
|
||||||
|
|
|
@ -175,8 +175,8 @@ package_list =
|
||||||
# People with pkglist permission can manage package lists in
|
# People with pkglist permission can manage package lists in
|
||||||
# active f$N and epel$N tags.
|
# active f$N and epel$N tags.
|
||||||
has_perm pkglist :: {
|
has_perm pkglist :: {
|
||||||
# Rawhide and epel7: adding, unblocking and blocking is allowed.
|
# Rawhide adding, unblocking and blocking is allowed.
|
||||||
tag f{{FedoraRawhideNumber}} epel7 && match action add unblock block :: allow
|
tag f{{FedoraRawhideNumber}} && match action add unblock block :: allow
|
||||||
# In branched blocking is allowed only before final freeze.
|
# 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
|
tag f{{FedoraBranchedNumber}} && match action add unblock {{ 'block' if not Frozen or FedoraBranchedBodhi != 'postbeta' else '' }} :: allow
|
||||||
# Stable releases: only adding and unblocking is allowed.
|
# Stable releases: only adding and unblocking is allowed.
|
||||||
|
@ -203,7 +203,6 @@ sidetag =
|
||||||
tag epel9-build :: allow
|
tag epel9-build :: allow
|
||||||
tag epel8-next-build :: allow
|
tag epel8-next-build :: allow
|
||||||
tag epel8-build :: allow
|
tag epel8-build :: allow
|
||||||
tag epel7-build :: allow
|
|
||||||
all :: deny
|
all :: deny
|
||||||
|
|
||||||
{% if env == "staging" %}
|
{% if env == "staging" %}
|
||||||
|
|
|
@ -14,7 +14,5 @@ f{{ FedoraPreviousPreviousCycleNumber }}-infra-stg
|
||||||
{% endif %}
|
{% endif %}
|
||||||
epel8-infra
|
epel8-infra
|
||||||
epel8-infra-stg
|
epel8-infra-stg
|
||||||
epel7-infra
|
|
||||||
epel7-infra-stg
|
|
||||||
coreos-pool
|
coreos-pool
|
||||||
eln
|
eln
|
||||||
|
|
|
@ -204,7 +204,7 @@ versions = []
|
||||||
|
|
||||||
[consumer_config.distgit_bugzilla_sync.products."Fedora EPEL"]
|
[consumer_config.distgit_bugzilla_sync.products."Fedora EPEL"]
|
||||||
branch_regex = '^epel\d+$'
|
branch_regex = '^epel\d+$'
|
||||||
versions = ["epel9", "epel8", "epel7"]
|
versions = ["epel9", "epel8"]
|
||||||
|
|
||||||
|
|
||||||
# Configuration section for scm_request_processor
|
# Configuration section for scm_request_processor
|
||||||
|
@ -261,11 +261,6 @@ stable_api = '2024-05-31'
|
||||||
security_fixes = '2024-05-31'
|
security_fixes = '2024-05-31'
|
||||||
bug_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]
|
[consumer_config.scm_request_processor.branch_slas.f40]
|
||||||
bug_fixes = '2025-05-13'
|
bug_fixes = '2025-05-13'
|
||||||
security_fixes = '2025-05-13'
|
security_fixes = '2025-05-13'
|
||||||
|
|
|
@ -71,12 +71,6 @@ tags = ({'name': 'Rawhide', 'tag': 'f41'},
|
||||||
{'name': 'EPEL 8 Testing', 'tag': 'epel8-testing'},
|
{'name': 'EPEL 8 Testing', 'tag': 'epel8-testing'},
|
||||||
{'name': 'EPEL 8 Staging', 'tag': 'epel8-staging'},
|
{'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 = {}
|
tags_to_name_map = {}
|
||||||
|
|
|
@ -94,12 +94,6 @@ handlers = ["console"]
|
||||||
|
|
||||||
# Infra tags
|
# 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]]
|
[[consumer_config.koji_instances.primary.tags]]
|
||||||
from = "epel8-infra-candidate"
|
from = "epel8-infra-candidate"
|
||||||
to = "epel8-infra-stg"
|
to = "epel8-infra-stg"
|
||||||
|
@ -281,18 +275,6 @@ handlers = ["console"]
|
||||||
key = "{{ (env == 'production')|ternary('epel-8', 'testkey') }}"
|
key = "{{ (env == 'production')|ternary('epel-8', 'testkey') }}"
|
||||||
keyid = "{{ (env == 'production')|ternary('2f86d6a1', 'd300e724') }}"
|
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
|
# ELN signing
|
||||||
|
|
||||||
[[consumer_config.koji_instances.primary.tags]]
|
[[consumer_config.koji_instances.primary.tags]]
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue