Skip to content

Commit 3e0e11a

Browse files
committed
MODULES-10023 fix xtrabackup tests on Debian 8, Ubuntu 14.04, Scientific 6
1 parent dc43dd9 commit 3e0e11a

File tree

3 files changed

+36
-0
lines changed

3 files changed

+36
-0
lines changed

manifests/params.pp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,10 @@
223223
} else {
224224
$php_package_name = 'php5-mysql'
225225
}
226+
if ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '16.04') < 0) or
227+
($::operatingsystem == 'Debian') {
228+
$xtrabackup_package_name_override = 'percona-xtrabackup-24'
229+
}
226230

227231
$python_package_name = 'python-mysqldb'
228232
$ruby_package_name = $::lsbdistcodename ? {

spec/acceptance/mysql_backup_spec.rb

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ class { 'mysql::server': root_password => 'password' }
153153
source => "http://repo.percona.com/apt/percona-release_latest.${facts['os']['distro']['codename']}_all.deb",
154154
}
155155
ensure_packages('gnupg')
156+
ensure_packages('gnupg2')
156157
ensure_packages('percona-release',{
157158
ensure => present,
158159
provider => 'dpkg',
@@ -175,6 +176,13 @@ class { 'mysql::server': root_password => 'password' }
175176
provider => 'rpm',
176177
source => "https://download.fedoraproject.org/pub/epel/epel-release-latest-${facts['os']['release']['major']}.noarch.rpm",
177178
})
179+
if ($facts['os']['name'] == 'Scientific') {
180+
# $releasever resolves to '6.10' instead of '6' which breaks Percona repos
181+
file { '/etc/yum/vars/releasever':
182+
ensure => present,
183+
content => '6',
184+
}
185+
}
178186
}
179187
default: { }
180188
}
@@ -258,6 +266,7 @@ class { 'mysql::server': root_password => 'password' }
258266
source => "http://repo.percona.com/apt/percona-release_latest.${facts['os']['distro']['codename']}_all.deb",
259267
}
260268
ensure_packages('gnupg')
269+
ensure_packages('gnupg2')
261270
ensure_packages('percona-release',{
262271
ensure => present,
263272
provider => 'dpkg',
@@ -280,6 +289,13 @@ class { 'mysql::server': root_password => 'password' }
280289
provider => 'rpm',
281290
source => "https://download.fedoraproject.org/pub/epel/epel-release-latest-${facts['os']['release']['major']}.noarch.rpm",
282291
})
292+
if ($facts['os']['name'] == 'Scientific') {
293+
# $releasever resolves to '6.10' instead of '6' which breaks Percona repos
294+
file { '/etc/yum/vars/releasever':
295+
ensure => present,
296+
content => '6',
297+
}
298+
}
283299
}
284300
default: { }
285301
}

spec/classes/mysql_backup_xtrabackup_spec.rb

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,14 @@ class { 'mysql::server': }
3333
else
3434
'percona-xtrabackup-20'
3535
end
36+
elsif facts[:operatingsystem] == 'Debian'
37+
'percona-xtrabackup-24'
38+
elsif facts[:operatingsystem] == 'Ubuntu'
39+
if Puppet::Util::Package.versioncmp(facts[:operatingsystemmajrelease], '16') >= 0
40+
'percona-xtrabackup'
41+
else
42+
'percona-xtrabackup-24'
43+
end
3644
else
3745
'percona-xtrabackup'
3846
end
@@ -106,6 +114,14 @@ class { 'mysql::server': }
106114
else
107115
'percona-xtrabackup-20'
108116
end
117+
elsif facts[:operatingsystem] == 'Debian'
118+
'percona-xtrabackup-24'
119+
elsif facts[:operatingsystem] == 'Ubuntu'
120+
if Puppet::Util::Package.versioncmp(facts[:operatingsystemmajrelease], '16') >= 0
121+
'percona-xtrabackup'
122+
else
123+
'percona-xtrabackup-24'
124+
end
109125
else
110126
'percona-xtrabackup'
111127
end

0 commit comments

Comments
 (0)