diff options
| author | Raphaël Pinson <raphael.pinson@camptocamp.com> | 2017-01-05 11:02:54 +0100 |
|---|---|---|
| committer | Raphaël Pinson <raphael.pinson@camptocamp.com> | 2017-01-05 11:02:54 +0100 |
| commit | 66d4612f0cb0e861fe2064510cc8f73d7bcc2574 (patch) | |
| tree | 847e27f35dbf3fd44de2e37059c4e91b34707b28 | |
| parent | 6dbacd719ecedc34d62ae9688a9416c4d8411524 (diff) | |
Modulesync: remove Puppet 3 tests
| -rw-r--r-- | .travis.yml | 14 | ||||
| -rw-r--r-- | Gemfile | 11 | ||||
| -rw-r--r-- | spec/acceptance/nodesets/centos-7.yml | 2 |
3 files changed, 11 insertions, 16 deletions
diff --git a/.travis.yml b/.travis.yml index 25f723f..3efa3ba 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.7 - env: PUPPET_GEM_VERSION="~> 4.5.0" + - rvm: 2.1.9 + env: PUPPET_GEM_VERSION="~> 4.0" + - rvm: 2.3.1 + env: PUPPET_GEM_VERSION="~> 4" notifications: email: false deploy: @@ -33,4 +29,4 @@ deploy: # all_branches is required to use tags all_branches: true # Only publish if our main Ruby target builds - rvm: 2.1.7 + rvm: 2.1.9 @@ -10,7 +10,6 @@ group :development, :unit_tests do gem 'puppet-lint-unquoted_string-check', :require => false gem 'puppet-lint-empty_string-check', :require => false gem 'puppet-lint-spaceship_operator_without_tag-check', :require => false - gem 'puppet-lint-variable_contains_upcase', :require => false gem 'puppet-lint-absolute_classname-check', :require => false gem 'puppet-lint-undef_in_function-check', :require => false gem 'puppet-lint-leading_zero-check', :require => false @@ -26,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 |