From 10621ec2e1612608ec45f733717e9d6f6e1970ee Mon Sep 17 00:00:00 2001 From: Till Maas Date: Apr 02 2017 21:56:30 +0000 Subject: Remove EOL collections: EPEL 5 and Fedora 18-23 Signed-off-by: Till Maas --- diff --git a/scripts/block_retired.py b/scripts/block_retired.py index ee3a9b6..e760a4a 100755 --- a/scripts/block_retired.py +++ b/scripts/block_retired.py @@ -17,8 +17,8 @@ from autosigner import SubjectSMTPHandler log = logging.getLogger(__name__) -RETIRING_BRANCHES = ["el5", "el6", "epel7", "f26", "master"] -PROD_ONLY_BRANCHES = ["el5", "el6", "epel7", "f26", "master"] +RETIRING_BRANCHES = ["el6", "epel7", "f26", "master"] +PROD_ONLY_BRANCHES = ["el6", "epel7", "f26", "master"] PRODUCTION_PKGDB = "https://admin.fedoraproject.org/pkgdb" STAGING_PKGDB = "https://admin.stg.fedoraproject.org/pkgdb" @@ -49,19 +49,12 @@ class ReleaseMapper(object): ("f26", "f26", ""), ("f25", "f25", ""), ("f24", "f24", ""), - ("f23", "f23", ""), - ("f22", "f22", ""), - ("f21", "f21", ""), - ("f20", "f20", ""), - ("f19", "f19", ""), - ("f18", "f18", ""), ) if not staging: self.mapping = self.mapping + ( ("epel7", "epel7", "epel7-build"), ("el6", "dist-6E-epel", "dist-6E-epel-build"), - ("el5", "dist-5E-epel", "dist-5E-epel-build"), ) def branchname(self, key=""): diff --git a/scripts/check_epel_deps.py b/scripts/check_epel_deps.py index bd5cbe0..8f93bc4 100644 --- a/scripts/check_epel_deps.py +++ b/scripts/check_epel_deps.py @@ -74,37 +74,6 @@ baseurl=http://kojipkgs.fedoraproject.org/repo/rhel/rhel-$basearch-server-lb-6/ enabled=1 """ % (treename, arch, treename, arch, distdir, arch, subdir, arch, arch) - elif treename == 'epel-5': - confheader = """ -[main] -debuglevel=2 -logfile=/var/log/yum.log -pkgpolicy=newest -distroverpkg=redhat-release -reposdir=/dev/null -keepcache=0 - -[%s-%s] -name=Fedora EPEL %s Tree - %s -baseurl=file://%s/%s/%s -enabled=1 - -[rhel-server] -name=RHEL Server -baseurl=http://kojipkgs.fedoraproject.org/repo/rhel/rhel-%s-server-5/ -enabled=1 - -[rhel5-vt] -name = rhel5 vt -baseurl=http://kojipkgs.fedoraproject.org/repo/rhel/rhel-%s-server-vt-5/ -enabled=1 - -[rhel5-productivity] -name = rhel5 productivity -baseurl=http://kojipkgs.fedoraproject.org/repo/rhel/rhel-%s-server-productivity-5/ -enabled=1 - -""" % (treename, arch, treename, arch, distdir, arch, subdir, arch, arch, arch) # Enable the testing repos? # This block is the same for both el5 and el6. diff --git a/scripts/check_epel_deps.sh b/scripts/check_epel_deps.sh index 175f506..7349488 100644 --- a/scripts/check_epel_deps.sh +++ b/scripts/check_epel_deps.sh @@ -5,6 +5,3 @@ /usr/local/bin/check_epel_deps.py --treename=epel-6 /mnt/koji/mash/updates/el6-epel /usr/local/bin/check_epel_deps.py --enable-testing --treename=epel-6 /mnt/koji/mash/updates/el6-epel - -/usr/local/bin/check_epel_deps.py --treename=epel-5 /mnt/koji/mash/updates/el5-epel -/usr/local/bin/check_epel_deps.py --enable-testing --treename=epel-5 /mnt/koji/mash/updates/el5-epel diff --git a/scripts/fedretire b/scripts/fedretire index 53464cb..e65870f 100755 --- a/scripts/fedretire +++ b/scripts/fedretire @@ -47,7 +47,7 @@ if __name__ == "__main__": parser = argparse.ArgumentParser(description="Helper to retire packages") parser.add_argument("--branch", default="master", nargs="*", choices=["master", "f26", "f25", "f24", - "epel7", "el6", "el5"]) + "epel7", "el6"]) parser.add_argument("--reasonfile", default=None) parser.add_argument("--reason", default=None) parser.add_argument("--orphan", default=False, action="store_true", diff --git a/scripts/find_unblocked_orphans.py b/scripts/find_unblocked_orphans.py index 9a552b1..3904806 100755 --- a/scripts/find_unblocked_orphans.py +++ b/scripts/find_unblocked_orphans.py @@ -35,17 +35,6 @@ except ImportError: with_table = False -EPEL5_RELEASE = dict( - repo='https://kojipkgs.fedoraproject.org/mash/updates/dist-5E-epel/' - 'x86_64/', - source_repo='https://kojipkgs.fedoraproject.org/mash/updates/' - 'dist-5E-epel/SRPMS', - tag='dist-5E-epel', - branch='el5', - mailto='epel-announce@lists.fedoraproject.org', - bcc=[], -) - EPEL6_RELEASE = dict( repo='https://kojipkgs.fedoraproject.org/mash/updates/dist-6E-epel/' 'x86_64/', @@ -93,7 +82,6 @@ RELEASES = { "branched": BRANCHED_RELEASE, "epel7": EPEL7_RELEASE, "epel6": EPEL6_RELEASE, - "epel5": EPEL5_RELEASE, } # pkgdb uid for orphan