MODULES-10023 fix xtrabackup tests on CentOS 6

Author: fraenki

manifests/params.pp

@@ -37,7 +37,7 @@
   $client_dev_package_provider = undef
   $daemon_dev_package_ensure   = 'present'
   $daemon_dev_package_provider = undef
-  $xtrabackup_package_name     = 'percona-xtrabackup'
+  $xtrabackup_package_name_default = 'percona-xtrabackup'
 
 
   case $::osfamily {
@@ -56,6 +56,7 @@
             $provider = 'mariadb'
           } else {
             $provider = 'mysql'
+            $xtrabackup_package_name_override = 'percona-xtrabackup-20'
           }
           if versioncmp($::operatingsystemmajrelease, '8') >= 0 {
             $java_package_name   = 'mariadb-java-client'
@@ -513,6 +514,12 @@
     },
   }
 
+  if defined('$xtrabackup_package_name_override') {
+    $xtrabackup_package_name = pick($xtrabackup_package_name_override, $xtrabackup_package_name_default)
+  } else {
+    $xtrabackup_package_name = $xtrabackup_package_name_default
+  }
+
   ## Additional graceful failures
   if $::osfamily == 'RedHat' and $::operatingsystemmajrelease == '4' and $::operatingsystem != 'Amazon' {
     fail(translate('Unsupported platform: puppetlabs-%{module_name} only supports RedHat 5.0 and beyond.', {'module_name' => $module_name}))

spec/acceptance/mysql_backup_spec.rb

@@ -203,7 +203,8 @@ class { 'mysql::server::backup':
     end
 
     it 'xtrabackup reports success for the full backup' do
-      run_shell('grep "completed OK" /tmp/xtrabackup_full.log') do |r|
+      # NOTE: Once support for CentOS 6 is dropped, we should check for "completed OK" instead.
+      run_shell('grep "xtrabackup: Transaction log of lsn" /tmp/xtrabackup_full.log') do |r|
         expect(r.exit_code).to be_zero
       end
     end
@@ -223,7 +224,8 @@ class { 'mysql::server::backup':
     end
 
     it 'xtrabackup reports success for the incremental backup' do
-      run_shell('grep "completed OK" /tmp/xtrabackup_inc.log') do |r|
+      # NOTE: Once support for CentOS 6 is dropped, we should check for "completed OK" instead.
+      run_shell('grep "xtrabackup: Transaction log of lsn" /tmp/xtrabackup_inc.log') do |r|
         expect(r.exit_code).to be_zero
       end
     end
@@ -307,7 +309,8 @@ class { 'mysql::server::backup':
     end
 
     it 'xtrabackup reports success for the backup' do
-      run_shell('grep "completed OK" /tmp/xtrabackup.log') do |r|
+      # NOTE: Once support for CentOS 6 is dropped, we should check for "completed OK" instead.
+      run_shell('grep "xtrabackup: Transaction log of lsn" /tmp/xtrabackup.log') do |r|
         expect(r.exit_code).to be_zero
       end
     end

spec/classes/mysql_backup_xtrabackup_spec.rb

@@ -27,6 +27,16 @@ class { 'mysql::server': }
           )
         end
 
+        package = if facts[:osfamily] == 'RedHat'
+                    if Puppet::Util::Package.versioncmp(facts[:operatingsystemmajrelease], '7') >= 0
+                      'percona-xtrabackup'
+                    else
+                      'percona-xtrabackup-20'
+                    end
+                  else
+                    'percona-xtrabackup'
+                  end
+
         it 'contains the weekly cronjob' do
           is_expected.to contain_cron('xtrabackup-weekly')
             .with(
@@ -37,7 +47,7 @@ class { 'mysql::server': }
               minute: '5',
               weekday: '0',
             )
-            .that_requires('Package[percona-xtrabackup]')
+            .that_requires("Package[#{package}]")
         end
 
         it 'contains the daily cronjob for weekdays 1-6' do
@@ -56,7 +66,7 @@ class { 'mysql::server': }
               minute: '5',
               weekday: '1-6',
             )
-            .that_requires('Package[percona-xtrabackup]')
+            .that_requires("Package[#{package}]")
         end
       end
 
@@ -90,6 +100,16 @@ class { 'mysql::server': }
           { additional_cron_args: '--backup --skip-ssl' }.merge(default_params)
         end
 
+        package = if facts[:osfamily] == 'RedHat'
+                    if Puppet::Util::Package.versioncmp(facts[:operatingsystemmajrelease], '7') >= 0
+                      'percona-xtrabackup'
+                    else
+                      'percona-xtrabackup-20'
+                    end
+                  else
+                    'percona-xtrabackup'
+                  end
+
         dateformat = case facts[:osfamily]
                      when 'FreeBSD', 'OpenBSD'
                        '$(date -v-sun +\%F)_full'
@@ -107,7 +127,7 @@ class { 'mysql::server': }
               minute: '5',
               weekday: '0',
             )
-            .that_requires('Package[percona-xtrabackup]')
+            .that_requires("Package[#{package}]")
         end
 
         it 'contains the daily cronjob for weekdays 1-6' do
@@ -120,7 +140,7 @@ class { 'mysql::server': }
               minute: '5',
               weekday: '1-6',
             )
-            .that_requires('Package[percona-xtrabackup]')
+            .that_requires("Package[#{package}]")
         end
       end