Drop unused code for usupported OS

voxpupuli · Apr 5, 2024 · 60b9fba · 60b9fba
1 parent a31b23c
commit 60b9fba
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 66 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/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') }