Skip to content

Commit 7d43a58

Browse files
committed
MODULES-10023 fix xtrabackup tests on SLES, RHEL 8 and RHEL/CentOS 5
1 parent 3e0e11a commit 7d43a58

File tree

3 files changed

+30
-4
lines changed

3 files changed

+30
-4
lines changed

manifests/params.pp

+4
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@
5454
/^(RedHat|CentOS|Scientific|OracleLinux)$/: {
5555
if versioncmp($::operatingsystemmajrelease, '7') >= 0 {
5656
$provider = 'mariadb'
57+
if versioncmp($::operatingsystemmajrelease, '8') >= 0 {
58+
$xtrabackup_package_name_override = 'percona-xtrabackup-24'
59+
}
5760
} else {
5861
$provider = 'mysql'
5962
$xtrabackup_package_name_override = 'percona-xtrabackup-20'
@@ -153,6 +156,7 @@
153156
$root_group = 'root'
154157
$mysql_group = 'mysql'
155158
$server_service_name = 'mysql'
159+
$xtrabackup_package_name_override = 'xtrabackup'
156160

157161
if $::operatingsystem =~ /(SLES|SLED)/ {
158162
if versioncmp( $::operatingsystemmajrelease, '12' ) >= 0 {

spec/acceptance/mysql_backup_spec.rb

+16-2
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,17 @@ class { 'mysql::server': root_password => 'password' }
166166
}
167167
}
168168
/RedHat/: {
169+
# RHEL/CentOS 5 is no longer supported by Percona, but older versions
170+
# of the repository are still available.
171+
if versioncmp($::operatingsystemmajrelease, '6') >= 0 {
172+
$percona_url = 'http://repo.percona.com/yum/percona-release-latest.noarch.rpm'
173+
} else {
174+
$percona_url = 'http://repo.percona.com/yum/release/5/os/noarch/percona-release-0.1-5.noarch.rpm'
175+
}
169176
ensure_packages('percona-release',{
170177
ensure => present,
171178
provider => 'rpm',
172-
source => 'http://repo.percona.com/yum/percona-release-latest.noarch.rpm',
179+
source => $percona_url,
173180
})
174181
ensure_packages('epel-release',{
175182
ensure => present,
@@ -279,10 +286,17 @@ class { 'mysql::server': root_password => 'password' }
279286
}
280287
}
281288
/RedHat/: {
289+
# RHEL/CentOS 5 is no longer supported by Percona, but older versions
290+
# of the repository are still available.
291+
if versioncmp($::operatingsystemmajrelease, '6') >= 0 {
292+
$percona_url = 'http://repo.percona.com/yum/percona-release-latest.noarch.rpm'
293+
} else {
294+
$percona_url = 'http://repo.percona.com/yum/release/5/os/noarch/percona-release-0.1-5.noarch.rpm'
295+
}
282296
ensure_packages('percona-release',{
283297
ensure => present,
284298
provider => 'rpm',
285-
source => 'http://repo.percona.com/yum/percona-release-latest.noarch.rpm',
299+
source => $percona_url,
286300
})
287301
ensure_packages('epel-release',{
288302
ensure => present,

spec/classes/mysql_backup_xtrabackup_spec.rb

+10-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ class { 'mysql::server': }
2828
end
2929

3030
package = if facts[:osfamily] == 'RedHat'
31-
if Puppet::Util::Package.versioncmp(facts[:operatingsystemmajrelease], '7') >= 0
31+
if Puppet::Util::Package.versioncmp(facts[:operatingsystemmajrelease], '8') >= 0
32+
'percona-xtrabackup-24'
33+
elsif Puppet::Util::Package.versioncmp(facts[:operatingsystemmajrelease], '7') >= 0
3234
'percona-xtrabackup'
3335
else
3436
'percona-xtrabackup-20'
@@ -41,6 +43,8 @@ class { 'mysql::server': }
4143
else
4244
'percona-xtrabackup-24'
4345
end
46+
elsif facts[:osfamily] == 'Suse'
47+
'xtrabackup'
4448
else
4549
'percona-xtrabackup'
4650
end
@@ -109,7 +113,9 @@ class { 'mysql::server': }
109113
end
110114

111115
package = if facts[:osfamily] == 'RedHat'
112-
if Puppet::Util::Package.versioncmp(facts[:operatingsystemmajrelease], '7') >= 0
116+
if Puppet::Util::Package.versioncmp(facts[:operatingsystemmajrelease], '8') >= 0
117+
'percona-xtrabackup-24'
118+
elsif Puppet::Util::Package.versioncmp(facts[:operatingsystemmajrelease], '7') >= 0
113119
'percona-xtrabackup'
114120
else
115121
'percona-xtrabackup-20'
@@ -122,6 +128,8 @@ class { 'mysql::server': }
122128
else
123129
'percona-xtrabackup-24'
124130
end
131+
elsif facts[:osfamily] == 'Suse'
132+
'xtrabackup'
125133
else
126134
'percona-xtrabackup'
127135
end

0 commit comments

Comments
 (0)