Testing 2.4.0

- voxpupuli/modulesync_config#303 (comment)
sacres · Jan 13, 2017 · 6c04b29 · 6c04b29
1 parent dbc4a63
commit 6c04b29
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -27,23 +27,23 @@ matrix:
   #   env: PUPPET_VERSION="~> 4.0" CHECK=test
   # - rvm: 2.3.3
   #   env: PUPPET_VERSION="~> 4.0" CHECK=build DEPLOY_TO_FORGE=yes
-  - rvm: 2.3.3
+  - rvm: 2.4.0
     env: PUPPET_VERSION="~> 4.0" CHECK=rubocop
   # - rvm: 2.3.3
   #   env: PUPPET_VERSION="~> 4.0" CHECK=test
   # - rvm: 2.4.0-rc1
   #   env: PUPPET_VERSION="~> 4.0" CHECK=test
   # allow_failures:
   #   - rvm: 2.4.0-rc1
-  - rvm: 2.3.3
+  - rvm: 2.4.0
     env: CHECK=acceptance BEAKER_debug=true BEAKER_set=docker/debian-8
     # dist: trusty
     services: docker
     sudo: required
     bundler_args: --without development
 
   - rvm: 2.4.0
-    env: CHECK=acceptance BEAKER_version=3.7.0 BEAKER_debug=true BEAKER_set=docker/centos-7
+    env: CHECK=acceptance BEAKER_debug=true BEAKER_set=docker/centos-7
     services: docker
     sudo: required
     bundler_args: --without development

diff --git a/Gemfile b/Gemfile
@@ -40,18 +40,16 @@ group :development do
 end
 
 group :system_tests do
-  # if beaker_version = ENV['BEAKER_VERSION']
-  #   gem 'beaker', *location_for(beaker_version)
-  # end
-  gem 'beaker', '~> 3.7.0',     :require => true
+  if beaker_version = ENV['BEAKER_VERSION']
+    gem 'beaker', *location_for(beaker_version)
+  end
   if beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
     gem 'beaker-rspec', *location_for(beaker_rspec_version)
   else
     gem 'beaker-rspec',  :require => false
   end
   gem 'serverspec',                    :require => false
-  gem 'beaker-puppet_install_helper', '~> 0.6.0', :require => true
-  gem 'json', '~> 2.0.2',              :require => true if RUBY_VERSION >= '2.4.0'
+  gem 'beaker-puppet_install_helper',  :require => false
 end