add more puppet versions, update docs

Gemfile

@@ -11,6 +11,7 @@ group :test do
   gem 'simplecov', '>= 0.11.0'
   gem 'simplecov-console'
   gem 'deep_merge'
+  gem 'hiera'
   gem 'librarian-puppet' , '>=2.0'
   # newer versions require ruby 2.2
   if RUBY_VERSION < "2.2.0"

README.md

@@ -284,37 +284,22 @@ $ bundle install
 $ bundle exec rake spec
 ```
 
-## Acceptance testing
+## Acceptance testing (work in progress)
 
-Just run:
+Fastest way is to run tests on prepared Docker images:
 ```
-bundle exec rake acceptance
+rake beaker:debian8-3.7
 ```
-When host machine is provisioned (puppet installed, etc.):
+When host machine is NOT provisioned (puppet installed, etc.):
 ```
-BEAKER_provision=no bundle exec rake acceptance
-```
-detailed Vagrant log:
-```
-VAGRANT_LOG=DEBUG BEAKER_provision=no bundle exec rake acceptance
-```
-
-Run on specific OS (see `spec/acceptance/nodesets`):
-```
-BEAKER_set=centos-7-x64 bundle exec rake acceptance
+PUPPET_install=yes bundle exec rake beaker:debian-8
 ```
 
-Change Vagrant provider:
+Run on specific OS (see `spec/acceptance/nodesets`), to see available sets:
 ```
-export VAGRANT_DEFAULT_PROVIDER=lxc
+rake beaker:sets
 ```
 
-Don't destroy machine after running specs:
-```
-BEAKER_destroy=no bundle exec rake acceptance
-```
-
-
 ## License
 
 Apache 2.0

spec/acceptance/nodesets/debian8-3.7.yml

@@ -0,0 +1,13 @@
+HOSTS:
+  debian-8-x64:
+    platform: debian-8-amd64
+    hypervisor : docker
+    image: deric/jessie-puppet:3.7.4
+    docker_preserve_image: false
+    roles:
+      - agent
+    debug: true
+CONFIG:
+  masterless: true
+  log_level: verbose
+  type: foss

spec/acceptance/nodesets/debian8-3.8.yml

@@ -0,0 +1,13 @@
+HOSTS:
+  debian-8-x64:
+    platform: debian-8-amd64
+    hypervisor : docker
+    image: deric/jessie-puppet:3.8.7
+    docker_preserve_image: false
+    roles:
+      - agent
+    debug: true
+CONFIG:
+  masterless: true
+  log_level: verbose
+  type: foss

spec/spec_helper_acceptance.rb

@@ -2,7 +2,7 @@
 require 'beaker-rspec/helpers/serverspec'
 require 'beaker/puppet_install_helper'
 
-run_puppet_install_helper unless ENV['BEAKER_provision'] == 'no'
+run_puppet_install_helper if ENV['PUPPET_install'] == 'yes'
 
 UNSUPPORTED_PLATFORMS = ['Suse','windows','AIX','Solaris']