Fix Beaker settings

Gemfile

@@ -31,25 +31,11 @@ group :test do
 end
 
 group :system_tests do
-  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 "beaker", '2.41.0', :require => false
+  gem "beaker-rspec", '5.6.0', :require => false
   gem 'beaker-puppet_install_helper',  :require => false
 end
 
-
-
-if facterversion = ENV['FACTER_GEM_VERSION']
-  gem 'facter', facterversion.to_s, :require => false, :groups => [:test]
-else
-  gem 'facter', :require => false, :groups => [:test]
-end
-
 ENV['PUPPET_VERSION'].nil? ? puppetversion = '~> 4.0' : puppetversion = ENV['PUPPET_VERSION'].to_s
 gem 'puppet', puppetversion, :require => false, :groups => [:test]
 

spec/acceptance/nodesets/centos-7-docker.yml

@@ -0,0 +1,11 @@
+HOSTS:
+  centos-7-x64:
+    platform: el-7-x86_64
+    hypervisor : docker
+    image: centos:7
+    docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_preserve_image: true
+CONFIG:
+  type: foss
+  log_level: debug

spec/acceptance/nodesets/debian-8-docker.yml

@@ -0,0 +1,16 @@
+HOSTS:
+  debian-8:
+    roles:
+      - master
+    platform: debian-8-amd64
+    image: debian:8
+    hypervisor: docker
+    docker_cmd: ["/bin/systemd"]
+    docker_preserve_image: true
+    docker_image_commands:
+      - apt-get install -yq wget net-tools
+      - rm /lib/systemd/system/systemd*udev*
+      - rm /lib/systemd/system/getty.target
+CONFIG:
+  type: foss
+  log_level: debug

spec/acceptance/nodesets/ubuntu-1604-docker.yml

@@ -0,0 +1,13 @@
+HOSTS:
+  ubuntu-16-04:
+    platform: ubuntu-16.04-amd64
+    image: ubuntu:16.04
+    hypervisor: docker
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'apt-get install -y net-tools wget curl'
+      - 'locale-gen en_US.UTF-8'
+    docker_preserve_image: true
+CONFIG:
+  type: foss
+  log_level: debug

spec/acceptance/redis_spec.rb

@@ -2,6 +2,13 @@
 
 describe 'redis' do
   it 'should run successfully' do
+    case fact('osfamily')
+    when 'Debian'
+      redis_name = 'redis-server'
+    else
+      redis_name = 'redis'
+    end
+
     pp = <<-EOS
     Exec {
       path => [ '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', ]
@@ -17,7 +24,11 @@ class { '::redis':
     apply_manifest(pp, :catch_changes => true)
   end
 
-  describe package('redis') do
+  describe package(redis_name) do
     it { should be_installed }
   end
+
+  describe service(redis_name) do
+    it { should be_running }
+  end
 end

spec/spec_helper_acceptance.rb

@@ -1,15 +1,7 @@
 require 'beaker-rspec'
+require 'beaker/puppet_install_helper'
 
-unless ENV['RS_PROVISION'] == 'no'
-  hosts.each do |host|
-    # Install Puppet
-    if host.is_pe?
-      install_pe
-    else
-      install_puppet
-    end
-  end
-end
+run_puppet_install_helper unless ENV['BEAKER_provision'] == 'no'
 
 RSpec.configure do |c|
   # Project root
@@ -23,9 +15,14 @@
     puppet_module_install(:source => proj_root, :module_name => 'redis')
 
     hosts.each do |host|
-      shell("/bin/touch #{default['puppetpath']}/hiera.yaml")
-
-      shell('puppet module install puppetlabs-stdlib',  { :acceptable_exit_codes => [0,1] })
+      if fact('osfamily') == 'Debian'
+        # These should be on all Deb-flavor machines by default...
+        # But Docker is often more slimline
+        shell('apt-get install apt-transport-https software-properties-common -y', { :acceptable_exit_codes => [0] })
+      end
+      on host, puppet('module', 'install', 'puppetlabs-stdlib -v 4.11.0'), { :acceptable_exit_codes => [0] }
+      on host, puppet('module', 'install', 'puppetlabs-apt -v 2.3.0'), { :acceptable_exit_codes => [0] }
+      on host, puppet('module', 'install', 'stahnma-epel -v 1.0.2'), { :acceptable_exit_codes => [0] }
     end
   end
 end