Merge pull request #266 from jcpunk/repodefs

Remove obsolete repos from CentOS 9
voxpupuli · Jul 6, 2022 · 9676ef9 · 9676ef9
2 parents ad2e1bb + 2cce004
commit 9676ef9
Show file tree

Hide file tree

Showing 4 changed files with 127 additions and 54 deletions.
diff --git a/data/os/RedHat/CentOS.yaml b/data/os/RedHat/CentOS.yaml
@@ -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'
+--- {}
diff --git a/data/os/RedHat/CentOS/7.yaml b/data/os/RedHat/CentOS/7.yaml
@@ -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
@@ -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'
diff --git a/data/os/RedHat/CentOS/8.yaml b/data/os/RedHat/CentOS/8.yaml
@@ -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:
@@ -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'
diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb
@@ -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
@@ -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[
@@ -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[
@@ -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