From 4ccd1f0c84ff8defaed0a0306ab3ced308b8e53e Mon Sep 17 00:00:00 2001 From: Eric Putnam Date: Thu, 6 Jul 2017 14:42:11 -0700 Subject: [PATCH 1/2] (MODULES-5187) mysnc puppet 5 and ruby 2.4 --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4981b2592..0c6f904c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,10 +22,10 @@ matrix: script: bundle exec rake beaker services: docker sudo: required - - rvm: 2.3.1 + - rvm: 2.4.0 bundler_args: --without system_tests - env: PUPPET_GEM_VERSION="~> 4.0" - - rvm: 2.1.7 + env: PUPPET_GEM_VERSION="~> 5.0" + - rvm: 2.1.9 bundler_args: --without system_tests env: PUPPET_GEM_VERSION="~> 4.0" notifications: From e6230e778270490b0ba563f39c5dd00e5e6f8440 Mon Sep 17 00:00:00 2001 From: Eric Putnam Date: Fri, 14 Jul 2017 15:24:07 -0700 Subject: [PATCH 2/2] spec fixes for puppet 5 account_security and backup specs needed some light mocking to make up for what was probably just luck previously. this is a common theme in puppet 5 updates, resource dependencies seem to fail earlier. --- spec/classes/mysql_server_account_security_spec.rb | 4 ++++ spec/classes/mysql_server_backup_spec.rb | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/spec/classes/mysql_server_account_security_spec.rb b/spec/classes/mysql_server_account_security_spec.rb index d45c46e27..23523f8ec 100644 --- a/spec/classes/mysql_server_account_security_spec.rb +++ b/spec/classes/mysql_server_account_security_spec.rb @@ -3,6 +3,10 @@ describe 'mysql::server::account_security' do on_supported_os.each do |os, facts| context "on #{os}" do + let(:pre_condition) { <<-EOF + anchor {'mysql::server::end': } + EOF + } context "with fqdn==myhost.mydomain" do let(:facts) { facts.merge({ diff --git a/spec/classes/mysql_server_backup_spec.rb b/spec/classes/mysql_server_backup_spec.rb index dc75e9f58..dfe4814ed 100644 --- a/spec/classes/mysql_server_backup_spec.rb +++ b/spec/classes/mysql_server_backup_spec.rb @@ -3,6 +3,10 @@ describe 'mysql::server::backup' do on_supported_os.each do |os, facts| context "on #{os}" do + let(:pre_condition) { <<-EOF + class { 'mysql::server': } + EOF + } let(:facts) { facts.merge({ :root_home => '/root',