Merge pull request voxpupuli#210 from traylenator/ten

traylenator · web-flow · commit eea87a50996d · 2025-06-29T10:18:33.000+02:00
Support RH  10, Fed' 41,42 Ubu' 24.04 and Deb' 12
diff --git a/data/family/Debian.yaml b/data/family/Debian.yaml
diff --git a/data/family/RedHat.yaml b/data/family/RedHat.yaml
@@ -1,7 +1,7 @@
 ---
 
 cvmfs::repo_base: https://cvmrepo.s3.cern.ch/cvmrepo/yum
-cvmfs::repo_gpgkey: https://cvmrepo.s3.cern.ch/cvmrepo/yum/RPM-GPG-KEY-CernVM
+cvmfs::repo_gpgkey: https://cvmrepo.s3.cern.ch/cvmrepo/yum/RPM-GPG-KEY-CernVM-2048
 cvmfs::repo_includepkgs:
   - cvmfs-keys
   - cvmfs-libs
diff --git a/data/name/AlmaLinux/8.yaml b/data/name/AlmaLinux/8.yaml
@@ -0,0 +1,3 @@
+---
+
+cvmfs::repo_gpgkey: https://cvmrepo.s3.cern.ch/cvmrepo/yum/RPM-GPG-KEY-CernVM
diff --git a/data/name/AlmaLinux/9.yaml b/data/name/AlmaLinux/9.yaml
@@ -0,0 +1,3 @@
+---
+
+cvmfs::repo_gpgkey: https://cvmrepo.s3.cern.ch/cvmrepo/yum/RPM-GPG-KEY-CernVM
diff --git a/data/name/CentOS/8.yaml b/data/name/CentOS/8.yaml
@@ -0,0 +1,3 @@
+---
+
+cvmfs::repo_gpgkey: https://cvmrepo.s3.cern.ch/cvmrepo/yum/RPM-GPG-KEY-CernVM
diff --git a/data/name/CentOS/9.yaml b/data/name/CentOS/9.yaml
@@ -0,0 +1,3 @@
+---
+
+cvmfs::repo_gpgkey: https://cvmrepo.s3.cern.ch/cvmrepo/yum/RPM-GPG-KEY-CernVM
diff --git a/data/name/RedHat/8.yaml b/data/name/RedHat/8.yaml
@@ -0,0 +1,3 @@
+---
+
+cvmfs::repo_gpgkey: https://cvmrepo.s3.cern.ch/cvmrepo/yum/RPM-GPG-KEY-CernVM
diff --git a/data/name/RedHat/9.yaml b/data/name/RedHat/9.yaml
@@ -0,0 +1,3 @@
+---
+
+cvmfs::repo_gpgkey: https://cvmrepo.s3.cern.ch/cvmrepo/yum/RPM-GPG-KEY-CernVM
diff --git a/data/name/Rocky/8.yaml b/data/name/Rocky/8.yaml
@@ -0,0 +1,3 @@
+---
+
+cvmfs::repo_gpgkey: https://cvmrepo.s3.cern.ch/cvmrepo/yum/RPM-GPG-KEY-CernVM
diff --git a/data/name/Rocky/9.yaml b/data/name/Rocky/9.yaml
@@ -0,0 +1,3 @@
+---
+
+cvmfs::repo_gpgkey: https://cvmrepo.s3.cern.ch/cvmrepo/yum/RPM-GPG-KEY-CernVM
diff --git a/hiera.yaml b/hiera.yaml
@@ -6,8 +6,11 @@ defaults:  # Used for any hierarchy level that omits these keys.
   data_hash: yaml_data  # Use the built-in YAML backend.
 
 hierarchy:
+  - name: "osname.major"
+    paths:
+      - "name/%{facts.os.name}/%{facts.os.release.major}.yaml"
   - name: "osfamily"
     paths:
-      - "os/%{facts.os.family}.yaml"
+      - "family/%{facts.os.family}.yaml"
   - name: 'common'
     path: 'common.yaml'
diff --git a/manifests/yum.pp b/manifests/yum.pp
@@ -26,21 +26,26 @@
     proxy       => $repo_proxy,
   }
 
+  $_dir = $facts['os']['name'] ? {
+    'Fedora' => 'fedora',
+    default  => 'EL'
+  }
+
   yumrepo { 'cvmfs':
-    descr   => "CVMFS yum repository for el${facts['os']['release']['major']}",
-    baseurl => "${repo_base}/cvmfs/EL/${facts['os']['release']['major']}/${facts['os']['architecture']}",
+    descr   => "CVMFS yum repository for ${_dir}${facts['os']['release']['major']}",
+    baseurl => "${repo_base}/cvmfs/${_dir}/${facts['os']['release']['major']}/${facts['os']['architecture']}",
     enabled => true,
   }
 
   yumrepo { 'cvmfs-testing':
-    descr   => "CVMFS yum testing repository for el${facts['os']['release']['major']}",
-    baseurl => "${repo_base}/cvmfs-testing/EL/${facts['os']['release']['major']}/${facts['os']['architecture']}",
+    descr   => "CVMFS yum testing repository for ${_dir}${facts['os']['release']['major']}",
+    baseurl => "${repo_base}/cvmfs-testing/${_dir}/${facts['os']['release']['major']}/${facts['os']['architecture']}",
     enabled => $repo_testing_enabled,
   }
 
   yumrepo { 'cvmfs-config':
-    descr   => "CVMFS config yum repository for el${facts['os']['release']['major']}",
-    baseurl => "${repo_base}/cvmfs-config/EL/${facts['os']['release']['major']}/${facts['os']['architecture']}",
+    descr   => "CVMFS config yum repository for ${_dir}${facts['os']['release']['major']}",
+    baseurl => "${repo_base}/cvmfs-config/${_dir}/${facts['os']['release']['major']}/${facts['os']['architecture']}",
     enabled => $repo_config_enabled,
   }
 }
diff --git a/metadata.json b/metadata.json
@@ -28,43 +28,57 @@
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "11"
+        "11",
+        "12"
       ]
     },
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
         "20.04",
-        "22.04"
+        "22.04",
+        "24.04"
       ]
     },
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
         "8",
-        "9"
+        "9",
+        "10"
       ]
     },
     {
       "operatingsystem": "AlmaLinux",
       "operatingsystemrelease": [
         "8",
-        "9"
+        "9",
+        "10"
       ]
     },
     {
       "operatingsystem": "Rocky",
       "operatingsystemrelease": [
         "8",
-        "9"
+        "9",
+        "10"
       ]
     },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
-        "9"
+        "9",
+        "10"
+      ]
+    },
+    {
+      "operatingsystem": "Fedora",
+      "operatingsystemrelease": [
+        "41",
+        "42"
       ]
     }
+
   ],
   "requirements": [
     {
diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb
@@ -74,32 +74,49 @@
 
           # cvmfs-config repository should be disable by default.
           #
-          case facts[:os]['family']
-          when 'RedHat'
+          case facts[:os]['name']
+          when 'RedHat', 'AlmaLinux', 'Rocky'
             case facts[:os]['release']['major']
             when '8'
-              it { is_expected.to contain_yumrepo('cvmfs').with_baseurl('https://cvmrepo.s3.cern.ch/cvmrepo/yum/cvmfs/EL/8/x86_64') }
+              it {
+                is_expected.to contain_yumrepo('cvmfs').
+                  with_baseurl('https://cvmrepo.s3.cern.ch/cvmrepo/yum/cvmfs/EL/8/x86_64').
+                  with_gpgkey('https://cvmrepo.s3.cern.ch/cvmrepo/yum/RPM-GPG-KEY-CernVM')
+              }
+
               it { is_expected.to contain_yumrepo('cvmfs-testing').with_baseurl('https://cvmrepo.s3.cern.ch/cvmrepo/yum/cvmfs-testing/EL/8/x86_64') }
               it { is_expected.to contain_yumrepo('cvmfs-config').with_baseurl('https://cvmrepo.s3.cern.ch/cvmrepo/yum/cvmfs-config/EL/8/x86_64') }
-            else
-              it { is_expected.to contain_yumrepo('cvmfs').with_baseurl('https://cvmrepo.s3.cern.ch/cvmrepo/yum/cvmfs/EL/9/x86_64') }
+            when '9'
+              it {
+                is_expected.to contain_yumrepo('cvmfs').
+                  with_baseurl('https://cvmrepo.s3.cern.ch/cvmrepo/yum/cvmfs/EL/9/x86_64').
+                  with_gpgkey('https://cvmrepo.s3.cern.ch/cvmrepo/yum/RPM-GPG-KEY-CernVM')
+              }
+
               it { is_expected.to contain_yumrepo('cvmfs-testing').with_baseurl('https://cvmrepo.s3.cern.ch/cvmrepo/yum/cvmfs-testing/EL/9/x86_64') }
               it { is_expected.to contain_yumrepo('cvmfs-config').with_baseurl('https://cvmrepo.s3.cern.ch/cvmrepo/yum/cvmfs-config/EL/9/x86_64') }
+            else
+              it {
+                is_expected.to contain_yumrepo('cvmfs').
+                  with_baseurl('https://cvmrepo.s3.cern.ch/cvmrepo/yum/cvmfs/EL/10/x86_64').
+                  with_gpgkey('https://cvmrepo.s3.cern.ch/cvmrepo/yum/RPM-GPG-KEY-CernVM-2048')
+              }
+
+              it { is_expected.to contain_yumrepo('cvmfs-testing').with_baseurl('https://cvmrepo.s3.cern.ch/cvmrepo/yum/cvmfs-testing/EL/10/x86_64') }
+              it { is_expected.to contain_yumrepo('cvmfs-config').with_baseurl('https://cvmrepo.s3.cern.ch/cvmrepo/yum/cvmfs-config/EL/10/x86_64') }
             end
             it do
               is_expected.to contain_yumrepo('cvmfs').with(
                 'enabled' => true,
                 'gpgcheck' => true,
-                'gpgkey' => 'https://cvmrepo.s3.cern.ch/cvmrepo/yum/RPM-GPG-KEY-CernVM',
                 'priority' => 80
               )
             end
 
             it do
               is_expected.to contain_yumrepo('cvmfs-testing').with(
                 'enabled' => false,
-                'gpgcheck' => true,
-                'gpgkey' => 'https://cvmrepo.s3.cern.ch/cvmrepo/yum/RPM-GPG-KEY-CernVM'
+                'gpgcheck' => true
               )
             end
 
@@ -110,25 +127,40 @@
                 'gpgkey' => 'https://cvmrepo.s3.cern.ch/cvmrepo/yum/RPM-GPG-KEY-CernVM'
               )
             end
+          when 'Fedora'
+            case facts[:os]['release']['major']
+            when '41'
+              it { is_expected.to contain_yumrepo('cvmfs').with_baseurl('https://cvmrepo.s3.cern.ch/cvmrepo/yum/cvmfs/fedora/41/x86_64') }
+              it { is_expected.to contain_yumrepo('cvmfs-testing').with_baseurl('https://cvmrepo.s3.cern.ch/cvmrepo/yum/cvmfs-testing/fedora/41/x86_64') }
+              it { is_expected.to contain_yumrepo('cvmfs-config').with_baseurl('https://cvmrepo.s3.cern.ch/cvmrepo/yum/cvmfs-config/fedora/41/x86_64') }
+            else
+              it { is_expected.to contain_yumrepo('cvmfs').with_baseurl('https://cvmrepo.s3.cern.ch/cvmrepo/yum/cvmfs/fedora/42/x86_64') }
+              it { is_expected.to contain_yumrepo('cvmfs-testing').with_baseurl('https://cvmrepo.s3.cern.ch/cvmrepo/yum/cvmfs-testing/fedora/42/x86_64') }
+              it { is_expected.to contain_yumrepo('cvmfs-config').with_baseurl('https://cvmrepo.s3.cern.ch/cvmrepo/yum/cvmfs-config/fedora/42/x86_64') }
+            end
           else
             case facts[:os]['distro']['codename']
-            when 'focal'
+            when 'bookworm'
               it {
-                is_expected.to contain_apt__source('cvmfs').with({
-                                                                   'ensure' => 'present',
-                                                                   'location' => 'https://cvmrepo.s3.cern.ch/cvmrepo/apt',
-                                                                   'release' => 'focal-prod',
-                                                                   'allow_unsigned' => false,
-                                                                 })
+                is_expected.to contain_apt__source('cvmfs').with(
+                  {
+                    'ensure' => 'present',
+                    'location' => 'https://cvmrepo.s3.cern.ch/cvmrepo/apt',
+                    'release' => 'bookworm-prod',
+                    'allow_unsigned' => false,
+                  }
+                )
               }
 
               it {
-                is_expected.to contain_apt__source('cvmfs-testing').with({
-                                                                           'ensure' => 'absent',
-                                                                           'location' => 'https://cvmrepo.s3.cern.ch/cvmrepo/apt',
-                                                                           'release' => 'focal-testing',
-                                                                           'allow_unsigned' => false,
-                                                                         })
+                is_expected.to contain_apt__source('cvmfs-testing').with(
+                  {
+                    'ensure' => 'absent',
+                    'location' => 'https://cvmrepo.s3.cern.ch/cvmrepo/apt',
+                    'release' => 'bookworm-testing',
+                    'allow_unsigned' => false,
+                  }
+                )
               }
             end
           end
@@ -189,9 +221,9 @@
 
             case facts[:os]['family']
             when 'RedHat'
-              it { is_expected.to contain_yumrepo('cvmfs').with_baseurl(%r{^http://example.org/base/cvmfs/EL/\d+/x86_64$}) }
-              it { is_expected.to contain_yumrepo('cvmfs-testing').with_baseurl(%r{^http://example.org/base/cvmfs-testing/EL/\d+/x86_64$}) }
-              it { is_expected.to contain_yumrepo('cvmfs-config').with_baseurl(%r{^http://example.org/base/cvmfs-config/EL/\d+/x86_64$}) }
+              it { is_expected.to contain_yumrepo('cvmfs').with_baseurl(%r{^http://example.org/base/cvmfs/(fedora|EL)/\d+/x86_64$}) }
+              it { is_expected.to contain_yumrepo('cvmfs-testing').with_baseurl(%r{^http://example.org/base/cvmfs-testing/(EL|fedora)/\d+/x86_64$}) }
+              it { is_expected.to contain_yumrepo('cvmfs-config').with_baseurl(%r{^http://example.org/base/cvmfs-config/(EL|fedora)/\d+/x86_64$}) }
             else
               it { is_expected.to contain_apt__source('cvmfs').with_location('http://example.org/base') }
               it { is_expected.to contain_apt__source('cvmfs-testing').with_location('http://example.org/base') }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+---`
	`2`	`+`
	`3`	`+cvmfs::repo_gpgkey: https://cvmrepo.s3.cern.ch/cvmrepo/yum/RPM-GPG-KEY-CernVM`