diff --git a/.travis.yml b/.travis.yml index 92d25c3421054b0ca6e5598bf2e05f6b44f589eb..5e132dfa483f677203b03f0cada6a946cb98922a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,14 +13,8 @@ script: ["bundle exec rake validate", "bundle exec rake lint", "bundle exec rake matrix: fast_finish: true include: - - rvm: 1.9.3 - env: PUPPET_GEM_VERSION="~> 3.0" - - rvm: 2.0.0 - env: PUPPET_GEM_VERSION="~> 3.0" - - rvm: 2.0.0 - env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes" - rvm: 2.1.9 - env: PUPPET_GEM_VERSION="~> 4.5.0" + env: PUPPET_GEM_VERSION="~> 4.0" - rvm: 2.3.1 env: PUPPET_GEM_VERSION="~> 4" - rvm: default diff --git a/Gemfile b/Gemfile index 7a15ede55e2571404a2f511bbb201ca1acf55d87..377d0c162e35ac273e96068d68312cef6b77de94 100644 --- a/Gemfile +++ b/Gemfile @@ -25,11 +25,11 @@ group :development, :unit_tests do end group :system_tests do - gem 'beaker', :require => false - gem 'beaker-rspec', :require => false - gem 'beaker_spec_helper', :require => false - gem 'serverspec', :require => false - gem 'specinfra', :require => false + gem 'beaker', :require => false + gem 'beaker-rspec', '> 5', :require => false + gem 'beaker_spec_helper', :require => false + gem 'serverspec', :require => false + gem 'specinfra', :require => false end if facterversion = ENV['FACTER_GEM_VERSION'] diff --git a/spec/acceptance/nodesets/centos-7.yml b/spec/acceptance/nodesets/centos-7.yml index bc57539167a23444c72f5c6251408d77a227ae1c..a8fa4686b7b3eebc0760602a61f607b66d1977b8 100644 --- a/spec/acceptance/nodesets/centos-7.yml +++ b/spec/acceptance/nodesets/centos-7.yml @@ -9,7 +9,7 @@ HOSTS: docker_preserve_image: true docker_cmd: '["/usr/sbin/init"]' docker_image_commands: - - 'yum install -y crontabs tar wget' + - 'yum install -y crontabs tar wget iproute' CONFIG: type: aio log_level: debug diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index b8e67477e87a9e7cc0a094f23e868e7ece5da6cc..94d30d5ce06d0e4d2be10bc4361bc4fd602bb7e4 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -24,8 +24,6 @@ require 'pathname' dir = Pathname.new(__FILE__).parent Puppet[:modulepath] = File.join(dir, 'fixtures', 'modules') -RSpec::Expectations.configuration.on_potential_false_positives = :nothing - # There's no real need to make this version dependent, but it helps find # regressions in Puppet #