Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove obsolete repos from CentOS 9 #266

Merged
merged 1 commit into from
Jul 6, 2022
Merged

Remove obsolete repos from CentOS 9 #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 1 addition & 47 deletions data/os/RedHat/CentOS.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,47 +1 @@
---
yum::os_default_repos:
- 'extras'
- 'centosplus'
- 'fasttrack'
- 'extras-source'
- 'base-debuginfo'
yum::repos:
extras:
enabled: false
descr: 'CentOS-$releasever - Extras'
mirrorlist: 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=extras&infra=$infra'
gpgcheck: true
gpgkey: "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-%{facts.os.release.major}"
target: '/etc/yum.repos.d/CentOS-Base.repo'

centosplus:
enabled: false
descr: 'CentOS-$releasever - Plus'
mirrorlist: 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=centosplus&infra=$infra'
gpgcheck: true
gpgkey: "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-%{facts.os.release.major}"
target: '/etc/yum.repos.d/CentOS-Base.repo'

fasttrack:
enabled: false
descr: 'CentOS-$releasever - fasttrack'
mirrorlist: 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=fasttrack&infra=$infra'
gpgcheck: true
gpgkey: "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-%{facts.os.release.major}"
target: '/etc/yum.repos.d/CentOS-fasttrack.repo'

extras-source:
enabled: false
descr: 'CentOS-$releasever - Extras Sources'
baseurl: 'http://vault.centos.org/centos/$releasever/extras/Source/'
gpgcheck: true
gpgkey: "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-%{facts.os.release.major}"
target: '/etc/yum.repos.d/CentOS-Sources.repo'

base-debuginfo:
enabled: false
descr: 'CentOS-$releasever - Debuginfo'
baseurl: 'http://debuginfo.centos.org/$releasever/$basearch/'
gpgcheck: true
gpgkey: "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-Debug-%{facts.os.release.major}"
target: '/etc/yum.repos.d/CentOS-Debuginfo.repo'
--- {}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer it to delete the file, but I don't think there is a best practice for it.

46 changes: 46 additions & 0 deletions data/os/RedHat/CentOS/7.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ yum::os_default_repos:
- 'base-source'
- 'updates-source'
- 'centos-media'
- 'fasttrack'
- 'extras-source'
- 'base-debuginfo'
- 'extras'
- 'centosplus'

yum::repos:
base:
enabled: true
Expand Down Expand Up @@ -54,3 +60,43 @@ yum::repos:
gpgcheck: true
gpgkey: "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7"
target: '/etc/yum.repos.d/CentOS-Media.repo'

extras:
enabled: false
descr: 'CentOS-$releasever - Extras'
mirrorlist: 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=extras&infra=$infra'
gpgcheck: true
gpgkey: "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-%{facts.os.release.major}"
target: '/etc/yum.repos.d/CentOS-Base.repo'

fasttrack:
enabled: false
descr: 'CentOS-$releasever - fasttrack'
mirrorlist: 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=fasttrack&infra=$infra'
gpgcheck: true
gpgkey: "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-%{facts.os.release.major}"
target: '/etc/yum.repos.d/CentOS-fasttrack.repo'

extras-source:
enabled: false
descr: 'CentOS-$releasever - Extras Sources'
baseurl: 'http://vault.centos.org/centos/$releasever/extras/Source/'
gpgcheck: true
gpgkey: "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-%{facts.os.release.major}"
target: '/etc/yum.repos.d/CentOS-Sources.repo'

base-debuginfo:
enabled: false
descr: 'CentOS-$releasever - Debuginfo'
baseurl: 'http://debuginfo.centos.org/$releasever/$basearch/'
gpgcheck: true
gpgkey: "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-Debug-%{facts.os.release.major}"
target: '/etc/yum.repos.d/CentOS-Debuginfo.repo'

centosplus:
enabled: false
descr: 'CentOS-$releasever - Plus'
mirrorlist: 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=centosplus&infra=$infra'
gpgcheck: true
gpgkey: "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-%{facts.os.release.major}"
target: '/etc/yum.repos.d/CentOS-Base.repo'
45 changes: 45 additions & 0 deletions data/os/RedHat/CentOS/8.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ yum::os_default_repos:
- 'Appstream-source'
- 'c8-media-BaseOS'
- 'c8-media-AppStream'
- 'extras'
- 'fasttrack'
- 'extras-source'
- 'base-debuginfo'
- 'centosplus'

yum::repos:
AppStream:
Expand Down Expand Up @@ -113,3 +118,43 @@ yum::repos:
gpgcheck: true
gpgkey: "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial"
target: '/etc/yum.repos.d/CentOS-Media.repo'

extras:
enabled: false
descr: 'CentOS-$releasever - Extras'
mirrorlist: 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=extras&infra=$infra'
gpgcheck: true
gpgkey: "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-%{facts.os.release.major}"
target: '/etc/yum.repos.d/CentOS-Base.repo'

fasttrack:
enabled: false
descr: 'CentOS-$releasever - fasttrack'
mirrorlist: 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=fasttrack&infra=$infra'
gpgcheck: true
gpgkey: "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-%{facts.os.release.major}"
target: '/etc/yum.repos.d/CentOS-fasttrack.repo'

extras-source:
enabled: false
descr: 'CentOS-$releasever - Extras Sources'
baseurl: 'http://vault.centos.org/centos/$releasever/extras/Source/'
gpgcheck: true
gpgkey: "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-%{facts.os.release.major}"
target: '/etc/yum.repos.d/CentOS-Sources.repo'

base-debuginfo:
enabled: false
descr: 'CentOS-$releasever - Debuginfo'
baseurl: 'http://debuginfo.centos.org/$releasever/$basearch/'
gpgcheck: true
gpgkey: "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-Debug-%{facts.os.release.major}"
target: '/etc/yum.repos.d/CentOS-Debuginfo.repo'

centosplus:
enabled: false
descr: 'CentOS-$releasever - Plus'
mirrorlist: 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=centosplus&infra=$infra'
gpgcheck: true
gpgkey: "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-%{facts.os.release.major}"
target: '/etc/yum.repos.d/CentOS-Base.repo'
42 changes: 35 additions & 7 deletions spec/classes/init_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,33 @@
it { is_expected.not_to contain_yumrepo('BaseOS') }

case facts[:os]['release']['major']
when '9'
it_behaves_like 'a catalog containing repos', %w[
appstream
baseos
crb
extras-common
appstream-source
appstream-debug
baseos-source
baseos-debug
crb-source
crb-debug
highavailability
highavailability-source
highavailability-debug
nfv
nfv-source
nfv-debug
rt
rt-source
rt-debug
resilientstorage
resilientstorage-source
resilientstorage-debug
extras-common
extras-common-source
]
when '8'
it_behaves_like 'a catalog containing repos', %w[
AppStream
Expand All @@ -315,6 +342,10 @@
Appstream-source
c8-media-BaseOS
c8-media-AppStream
extras
centosplus
extras-source
base-debuginfo
]
when '7'
it_behaves_like 'a catalog containing repos', %w[
Expand All @@ -327,6 +358,10 @@
base-debuginfo
centosplus
centos-media
extras
centosplus
extras-source
base-debuginfo
]
when '6'
it_behaves_like 'a catalog containing repos', %w[
Expand All @@ -340,13 +375,6 @@
centosplus
centos-media
]
else
it_behaves_like 'a catalog containing repos', %w[
extras
centosplus
extras-source
base-debuginfo
]
end
when 'Amazon'
it { is_expected.to have_yumrepo_resource_count(16) } # rubocop:disable RSpec/RepeatedExample
Expand Down