Skip to content

Commit 3efa123

Browse files
committed
MODULES-10023 fix xtrabackup tests on RHEL/CentOS 5
1 parent 0659b80 commit 3efa123

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

spec/acceptance/mysql_backup_spec.rb

+8-4
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,10 @@ class { 'mysql::server': root_password => 'password' }
170170
# of the repository are still available.
171171
if versioncmp($::operatingsystemmajrelease, '6') >= 0 {
172172
$percona_url = 'http://repo.percona.com/yum/percona-release-latest.noarch.rpm'
173+
$epel_url = "https://download.fedoraproject.org/pub/epel/epel-release-latest-${facts['os']['release']['major']}.noarch.rpm"
173174
} else {
174-
$percona_url = 'http://repo.percona.com/yum/release/5/os/noarch/percona-release-0.1-5.noarch.rpm'
175+
$percona_url = 'http://repo.percona.com/yum/release/5/os/noarch/percona-release-0.1-3.noarch.rpm'
176+
$epel_url = 'https://archives.fedoraproject.org/pub/archive/epel/epel-release-latest-5.noarch.rpm'
175177
}
176178
ensure_packages('percona-release',{
177179
ensure => present,
@@ -181,7 +183,7 @@ class { 'mysql::server': root_password => 'password' }
181183
ensure_packages('epel-release',{
182184
ensure => present,
183185
provider => 'rpm',
184-
source => "https://download.fedoraproject.org/pub/epel/epel-release-latest-${facts['os']['release']['major']}.noarch.rpm",
186+
source => $epel_url,
185187
})
186188
if ($facts['os']['name'] == 'Scientific') {
187189
# $releasever resolves to '6.10' instead of '6' which breaks Percona repos
@@ -290,8 +292,10 @@ class { 'mysql::server': root_password => 'password' }
290292
# of the repository are still available.
291293
if versioncmp($::operatingsystemmajrelease, '6') >= 0 {
292294
$percona_url = 'http://repo.percona.com/yum/percona-release-latest.noarch.rpm'
295+
$epel_url = "https://download.fedoraproject.org/pub/epel/epel-release-latest-${facts['os']['release']['major']}.noarch.rpm"
293296
} else {
294-
$percona_url = 'http://repo.percona.com/yum/release/5/os/noarch/percona-release-0.1-5.noarch.rpm'
297+
$percona_url = 'http://repo.percona.com/yum/release/5/os/noarch/percona-release-0.1-3.noarch.rpm'
298+
$epel_url = 'https://archives.fedoraproject.org/pub/archive/epel/epel-release-latest-5.noarch.rpm'
295299
}
296300
ensure_packages('percona-release',{
297301
ensure => present,
@@ -301,7 +305,7 @@ class { 'mysql::server': root_password => 'password' }
301305
ensure_packages('epel-release',{
302306
ensure => present,
303307
provider => 'rpm',
304-
source => "https://download.fedoraproject.org/pub/epel/epel-release-latest-${facts['os']['release']['major']}.noarch.rpm",
308+
source => $epel_url,
305309
})
306310
if ($facts['os']['name'] == 'Scientific') {
307311
# $releasever resolves to '6.10' instead of '6' which breaks Percona repos

0 commit comments

Comments
 (0)