Merge pull request #203 from Valantin/drop-code

Drop code for unsupported OS
voxpupuli · Apr 8, 2024 · 7025fed · 7025fed
2 parents 3f3bd5e + 60b9fba
commit 7025fed
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 72 deletions.
diff --git a/data/os/Debian/Debian/7.yaml b/data/os/Debian/Debian/7.yaml
diff --git a/data/os/Debian/Debian/8.yaml b/data/os/Debian/Debian/8.yaml
diff --git a/data/os/RedHat/CentOS/6.yaml b/data/os/RedHat/CentOS/6.yaml
diff --git a/data/os/RedHat/RedHat/6.yaml b/data/os/RedHat/RedHat/6.yaml
diff --git a/metadata.json b/metadata.json
@@ -27,28 +27,30 @@
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
         "7",
-        "8"
+        "8",
+        "9"
       ]
     },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
         "7",
-        "8"
+        "8",
+        "9"
       ]
     },
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "10",
-        "11"
+        "11",
+        "12"
       ]
     },
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "18.04",
-        "20.04"
+        "20.04",
+        "22.04"
       ]
     },
     {

diff --git a/spec/classes/director_spec.rb b/spec/classes/director_spec.rb
@@ -13,24 +13,12 @@
       when 'Debian'
         it { is_expected.to contain_class('bacula::director') }
 
-        case facts[:os]['release']['major']
-        when '7', '8'
-          expected_packages << 'bacula-director-common'
-        when '9'
-          expected_packages << 'bacula-director'
-        end
+        expected_packages << 'bacula-director'
         expected_packages << 'bacula-director-pgsql'
         expected_packages << 'bacula-console'
       when 'RedHat'
-        case facts[:os]['release']['major']
-        when '6'
-          expected_packages << 'bacula-director-common'
-          expected_packages << 'bacula-console'
-          expected_packages << 'bacula-director'
-        else
-          expected_packages << 'bacula-director'
-          expected_packages << 'bacula-console'
-        end
+        expected_packages << 'bacula-director'
+        expected_packages << 'bacula-console'
       when 'OpenBSD'
         expected_packages << 'bacula-server'
         expected_packages << 'bacula-pgsql'

diff --git a/spec/classes/storage_spec.rb b/spec/classes/storage_spec.rb
@@ -21,29 +21,11 @@
       case facts[:os]['family']
       when 'Debian'
         it { is_expected.to contain_package('bacula-sd') }
-
-        case facts[:os]['release']['major']
-        when '7', '8'
-          it { is_expected.to contain_package('bacula-sd-pgsql') }
-        end
       when 'RedHat'
-        case facts[:os]['release']['major']
-        when '6'
-          it do
-            is_expected.to contain_package('bacula-storage-common').with(
-              'ensure' => 'installed'
-            )
-          end
-
-          it { is_expected.not_to contain_package('bacula-storage') }
-        else
-          it do
-            is_expected.to contain_package('bacula-storage').with(
-              'ensure' => 'installed'
-            )
-          end
-
-          it { is_expected.not_to contain_package('bacula-storage-common') }
+        it do
+          is_expected.to contain_package('bacula-storage').with(
+            'ensure' => 'installed'
+          )
         end
       when 'OpenBSD'
         it { is_expected.to contain_package('bacula-server') }