Merge branch 'ci-update' into 'master'

Update the CI tests

See merge request shared-puppet-modules-group/tor!18

1 files changed, 9 insertions, 20 deletions

diff --git a/Gemfile b/Gemfile
index 7a16b94..514f893 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,23 +1,12 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-group :development, :unit_tests do
-  gem "rake"
-  gem "rspec-puppet", "~> 2.1", :require => false
-  gem "rspec-core"
-  gem "puppetlabs_spec_helper"
-  gem "semantic_puppet"
-  gem "metadata-json-lint"
-  gem "rspec-puppet-facts"
-  gem "mocha"
-end
+gem 'rake'
+gem 'puppet', ENV['PUPPET_VERSION']
 
-group :system_tests do
-  gem 'beaker'
-  gem 'beaker-rspec'
-  gem 'beaker_spec_helper'
-  gem 'serverspec'
+group :tests do
+  gem 'facter', ENV['FACTER_VERSION']
+  gem 'hiera', ENV['HIERA_VERSION']
+  gem 'puppetlabs_spec_helper'
+  gem 'metadata-json-lint'
+  gem 'semantic_puppet'
 end
-
-gem "puppet", ENV['PUPPET_VERSION'] || ENV['GEM_PUPPET_VERSION'] || ENV['PUPPET_GEM_VERSION'] || '~> 3.7.0'
-gem "facter", ENV['FACTER_VERSION'] || ENV['GEM_FACTER_VERSION'] || ENV['FACTER_GEM_VERSION'] || '~> 2.2.0'
-