summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaphaël Pinson <raphael.pinson@camptocamp.com>2017-01-05 13:12:05 +0100
committerRaphaël Pinson <raphael.pinson@camptocamp.com>2017-01-05 13:12:05 +0100
commita0321364514f52a4c110a15afbdad5109d768fe6 (patch)
tree9bec6bbc41c87a0d6cb63c99eed0d8d1539e3834
parentec94e54f14c214a5423681e90b99d6e73094bfeb (diff)
Modulesync: remove Puppet 3 tests
-rw-r--r--.travis.yml10
-rw-r--r--Gemfile10
-rw-r--r--spec/acceptance/nodesets/centos-7.yml2
3 files changed, 9 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml
index 96940f1..1d1bedf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,14 +13,10 @@ 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"
notifications:
email: false
deploy:
diff --git a/Gemfile b/Gemfile
index 7a15ede..377d0c1 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 bc57539..a8fa468 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