summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Gemfile4
-rw-r--r--extraconfig/tasks/major_upgrade_pacemaker_migrations.sh4
2 files changed, 5 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index 302ef415..e1cda8dc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,9 @@
source 'https://rubygems.org'
group :development, :test do
- gem 'puppetlabs_spec_helper', :require => false
+ # puppetlabs_spec_helper 1.2.0 pulled in a gem with ruby >= 2.2 requirements
+ # but CI has ruby 2.0.0.
+ gem 'puppetlabs_spec_helper', '1.1.1', :require => 'false'
gem 'puppet-lint', '~> 1.1'
gem 'puppet-lint-absolute_classname-check'
diff --git a/extraconfig/tasks/major_upgrade_pacemaker_migrations.sh b/extraconfig/tasks/major_upgrade_pacemaker_migrations.sh
index 164269dc..c36786a9 100644
--- a/extraconfig/tasks/major_upgrade_pacemaker_migrations.sh
+++ b/extraconfig/tasks/major_upgrade_pacemaker_migrations.sh
@@ -38,11 +38,11 @@ function is_mysql_upgrade_needed {
fi
local currentepoch=$(rpm -q --qf "%{epoch}" $name)
- local currentversion=$(rpm -q --qf "%{version}" $name)
+ local currentversion=$(rpm -q --qf "%{version}" $name | cut -d. -f-2)
local currentrelease=$(rpm -q --qf "%{release}" $name)
local newoutput=$(repoquery -a --pkgnarrow=updates --qf "%{epoch} %{version} %{release}\n" $name)
local newepoch=$(echo "$newoutput" | awk '{ print $1 }')
- local newversion=$(echo "$newoutput" | awk '{ print $2 }')
+ local newversion=$(echo "$newoutput" | awk '{ print $2 }' | cut -d. -f-2)
local newrelease=$(echo "$newoutput" | awk '{ print $3 }')
# With this we trigger the dump restore/path if we change either epoch or