Skip to content

(MODULES-5187)(MODULES-52080) mysnc puppet 5 and ruby 2.4 #229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 12, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ before_install:
matrix:
fast_finish: true
include:
- 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:
Expand Down
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ group :system_tests do
gem "beaker-pe", :require => false
gem "beaker-rspec", *location_for(ENV['BEAKER_RSPEC_VERSION'])
gem "beaker-hostgenerator", *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')
gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')
gem "beaker-testmode_switcher", '<= 0.2.0', :require => false
gem 'master_manipulator', :require => false
gem "master_manipulator", :require => false
end

gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])
Expand Down
22 changes: 18 additions & 4 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,28 @@ environment:
RUBY_VER: 21
- PUPPET_GEM_VERSION: ~> 4.0
RUBY_VER: 21-x64
- PUPPET_GEM_VERSION: ~> 4.0
RUBY_VER: 23
- PUPPET_GEM_VERSION: ~> 4.0
RUBY_VER: 23-x64
- PUPPET_GEM_VERSION: ~> 5.0
RUBY_VER: 24
- PUPPET_GEM_VERSION: ~> 5.0
RUBY_VER: 24-x64
- PUPPET_GEM_VERSION: 4.7.1
RUBY_VER: 21-x64
matrix:
fast_finish: true
install:
- SET PATH=C:\Ruby%RUBY_VER%\bin;%PATH%
- ps: |
# AppVeyor appears to have OpenSSL headers available already
# which msys2 would normally install with:
# pacman -S mingw-w64-x86_64-openssl --noconfirm
#
if ( $(ruby --version) -match "^ruby\s+2\.4" ) {
Write-Output "Building OpenSSL gem ~> 2.0.4 to fix Ruby 2.4 / AppVeyor issue"
gem install openssl --version '~> 2.0.4' --no-ri --no-rdoc
}

gem list openssl
ruby -ropenssl -e 'puts \"OpenSSL Version - #{OpenSSL::OPENSSL_VERSION}\"; puts \"OpenSSL Library Version - #{OpenSSL::OPENSSL_LIBRARY_VERSION}\"'
- bundle install --jobs 4 --retry 2 --without system_tests
- type Gemfile.lock
build: off
Expand Down
6 changes: 3 additions & 3 deletions spec/defines/database_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
:db_name => 'myTestDb',
:instance => 'MSSQLSERVER',
} }
end

describe 'Minimal Params' do
let(:pre_condition) { <<-EOF
define sqlserver::config{}
sqlserver::config {'MSSQLSERVER': }
EOF
}
end

describe 'Minimal Params' do
it_behaves_like 'compile'
end

Expand Down
5 changes: 5 additions & 0 deletions spec/defines/login/permissions_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@

describe 'sqlserver::login::permissions' do
let(:facts) { {:osfamily => 'windows'} }
let(:pre_condition) { <<-EOF
define sqlserver::config{}
sqlserver::config {'MSSQLSERVER': }
EOF
}
context 'validation errors' do
include_context 'manifests' do
let(:title) { 'myTitle' }
Expand Down
5 changes: 5 additions & 0 deletions spec/defines/login_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@
:login => 'myTitle',
:instance => 'MSSQLSERVER',
} }
let(:pre_condition) { <<-EOF
define sqlserver::config{}
sqlserver::config {'MSSQLSERVER': }
EOF
}
end

describe 'Minimal Params' do
Expand Down
5 changes: 5 additions & 0 deletions spec/defines/sp_configure_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@
:config_name => 'filestream access level',
:value => 1,
} }
let(:pre_condition) { <<-EOF
define sqlserver::config{}
sqlserver::config {'MSSQLSERVER': }
EOF
}
end
describe 'basic usage' do
let(:should_contain_command) { [
Expand Down
6 changes: 6 additions & 0 deletions spec/defines/user/permissions_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@

describe 'sqlserver::user::permissions' do
let(:facts) { {:osfamily => 'windows'} }
let(:pre_condition) { <<-EOF
define sqlserver::config{}
sqlserver::config {'MSSQLSERVER': }
EOF
}

context 'validation errors' do
include_context 'manifests' do
let(:title) { 'myTitle' }
Expand Down
5 changes: 5 additions & 0 deletions spec/defines/user_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@
let(:title) { 'loggingUser' }
let(:sqlserver_tsql_title) { 'user-MSSQLSERVER-myDatabase-loggingUser' }
let(:params) { {:user => 'loggingUser', :database => 'myDatabase'} }
let(:pre_condition) { <<-EOF
define sqlserver::config{}
sqlserver::config {'MSSQLSERVER': }
EOF
}
end

describe 'should fail when password above 128 characters' do
Expand Down