Merge pull request #1597 from puppetlabs/CAT-1428-removal-of-red-hat-…

…scientific-oracle-linux-6-for-mysql-module (CAT-1428) Removal of redhat/scientific/oraclelinux 6 for mysql module
puppetlabs · Sep 20, 2023 · 29cfd39 · 29cfd39
2 parents 79b8570 + 83ac571
commit 29cfd39
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 14 deletions.
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -485,7 +485,7 @@
   }
 
   ## Additional graceful failures
-  if $facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] == '4' and $facts['os']['name'] != 'Amazon' {
-    fail("Unsupported platform: puppetlabs-${module_name} only supports RedHat 6.0 and beyond.")
+  if $facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] < '7' and $facts['os']['name'] != 'Amazon' {
+    fail("Unsupported platform: puppetlabs-${module_name} only supports RedHat 7.0 and beyond.")
   }
 }
diff --git a/spec/acceptance/05_mysql_xtrabackup_spec.rb b/spec/acceptance/05_mysql_xtrabackup_spec.rb
@@ -40,7 +40,7 @@ class { 'mysql::server': root_password => 'password' }
           /RedHat/: {
             # RHEL/CentOS 5 is no longer supported by Percona, but older versions
             # of the repository are still available.
-            if versioncmp($facts['os']['release']['major'], '6') >= 0 {
+            if versioncmp($facts['os']['release']['major'], '7') >= 0 {
               $percona_url = 'http://repo.percona.com/yum/percona-release-latest.noarch.rpm'
               $epel_url = "https://download.fedoraproject.org/pub/epel/epel-release-latest-${facts['os']['release']['major']}.noarch.rpm"
             } else {

diff --git a/spec/acceptance/types/mysql_plugin_spec.rb b/spec/acceptance/types/mysql_plugin_spec.rb
@@ -9,11 +9,6 @@
 case os[:family]
 when 'redhat'
   case os[:release].to_i
-  when 5
-    plugin = nil # Plugins not supported on mysql on RHEL 5
-  when 6
-    plugin     = 'example'
-    plugin_lib = 'ha_example.so'
   when 7
     plugin     = 'pam'
     plugin_lib = 'auth_pam.so'

diff --git a/spec/classes/mysql_backup_xtrabackup_spec.rb b/spec/classes/mysql_backup_xtrabackup_spec.rb
@@ -40,10 +40,8 @@ class { 'mysql::server': }
         package = if facts[:os]['family'] == 'RedHat'
                     if Puppet::Util::Package.versioncmp(facts[:os]['release']['major'], '8') >= 0
                       'percona-xtrabackup-24'
-                    elsif Puppet::Util::Package.versioncmp(facts[:os]['release']['major'], '7') >= 0
-                      'percona-xtrabackup'
                     else
-                      'percona-xtrabackup-20'
+                      'percona-xtrabackup'
                     end
                   elsif facts[:os]['name'] == 'Debian'
                     'percona-xtrabackup-24'
@@ -195,10 +193,8 @@ class { 'mysql::server': }
         package = if facts[:os]['family'] == 'RedHat'
                     if Puppet::Util::Package.versioncmp(facts[:os]['release']['major'], '8') >= 0
                       'percona-xtrabackup-24'
-                    elsif Puppet::Util::Package.versioncmp(facts[:os]['release']['major'], '7') >= 0
-                      'percona-xtrabackup'
                     else
-                      'percona-xtrabackup-20'
+                      'percona-xtrabackup'
                     end
                   elsif facts[:os]['name'] == 'Debian'
                     'percona-xtrabackup-24'