Switch to litmus acceptance testing

.fixtures.yml

@@ -4,6 +4,10 @@ fixtures:
     cron: "#{source_dir}"
   repositories:
     stdlib: https://github.com/puppetlabs/puppetlabs-stdlib
+    # Litmus
+    provision: git://github.com/puppetlabs/provision.git
+    puppet_agent: git://github.com/puppetlabs/puppetlabs-puppet_agent.git
+    facts: git://github.com/puppetlabs/puppetlabs-facts.git
   forge_modules:
     cron_core:
       repo: puppetlabs/cron_core

.sync.yml

@@ -10,13 +10,13 @@ spec/spec_helper.rb:
 
 # deleted
 .rspec:
-  unmanaged: true
+  delete: true
 appveyor.yml:
-  unmanaged: true
+  delete: true
 .gitlab-ci.yml:
-  unmanaged: true
+  delete: true
 .vscode/extensions.json:
-  unmanaged: true
+  delete: true
 
 # custom
 .rubocop.yml:

.travis.yml

@@ -1,12 +1,14 @@
 ---
+# TODO This is for acceptance testing only
 sudo: required
 services: [ docker ]
 
-before_install: rm Gemfile.lock || true
-cache: bundler
-
 language: ruby
-
+cache: bundler
+before_install:
+  - rm -f Gemfile.lock
+  - gem --version
+  - bundle --version
 script: bundle exec rake $DO
 
 jobs:
@@ -32,26 +34,12 @@ jobs:
         - DO=spec
         - PUPPET='~> 6'
     - stage: acceptance
-      env:
-        - DO=beaker
-        - BEAKER_set=ubuntu_1404
-        - BEAKER_PUPPET_COLLECTION=puppet5
-    - env:
-        - DO=beaker
-        - BEAKER_set=ubuntu_1604
-        - BEAKER_PUPPET_COLLECTION=puppet5
-    - env:
-        - DO=beaker
-        - BEAKER_set=ubuntu_1604
-        - BEAKER_PUPPET_COLLECTION=puppet6
-    - env:
-        - DO=beaker
-        - BEAKER_set=ubuntu_1804
-        - BEAKER_PUPPET_COLLECTION=puppet5
-    - env:
-        - DO=beaker
-        - BEAKER_set=ubuntu_1804
-        - BEAKER_PUPPET_COLLECTION=puppet6
+      bundler_args: --with acceptance
+      script:
+        - bundle exec rake 'litmus:provision_list[default]'
+        - bundle exec rake 'litmus:install_agent'
+        - bundle exec rake 'litmus:install_module'
+        - bundle exec rake 'litmus:acceptance:parallel'
     - stage: deploy
       script: true
       env:

Gemfile

@@ -2,20 +2,17 @@
 
 source 'https://rubygems.org'
 
-group :ed25519 do
+group :acceptance, optional: true do
+  gem 'puppet_litmus' if ENV['PUPPET'] !~ /(4|5)$/
+  gem 'serverspec'
+end
+
+group :ed25519, optional: true do
   gem 'bcrypt_pbkdf', '< 2.0'
   gem 'rbnacl', '< 5.0'
   gem 'rbnacl-libsodium'
 end
 
-group :acceptance do
-  gem 'beaker-docker'
-  gem 'beaker-module_install_helper'
-  gem 'beaker-puppet'
-  gem 'beaker-puppet_install_helper'
-  gem 'beaker-rspec'
-end
-
 group :documentation do
   gem 'puppet-strings'
   gem 'rgen'

Rakefile

@@ -6,6 +6,7 @@ require 'metadata-json-lint/rake_task'
 require 'puppet-strings/tasks'
 require 'rubocop/rake_task'
 require 'yamllint/rake_task'
+require 'puppet_litmus/rake_tasks' if Bundler.rubygems.find_name('puppet_litmus').any?
 
 PuppetLint.configuration.relative     = true
 PuppetLint.configuration.ignore_paths = ['spec/fixtures/**/*.pp', 'spec/_fixtures/**/*.pp']

metadata.json

@@ -29,7 +29,7 @@
       "version_requirement": ">= 4.4.0 < 7.0.0"
     }
   ],
-  "pdk-version": "1.12.0",
+  "pdk-version": "1.13.0",
   "template-url": "https://github.com/puppetlabs/pdk-templates#master",
-  "template-ref": "1.12.0-0-g55d9ae2"
+  "template-ref": "1.13.0-0-g66e1443"
 }

provision.yaml

@@ -0,0 +1,5 @@
+---
+default:
+  provisioner: docker
+  images: [ 'waffleimage/ubuntu18.04' ]
+...

spec/acceptance/cron_job_spec.rb

@@ -14,7 +14,7 @@
 
     PUPPET
 
-    apply_and_test_idempotence(pp)
+    idempotent_apply(pp)
 
     describe cron do
       it { is_expected.to have_entry '* * * * * echo hi > /tmp/say_hi' }
@@ -44,7 +44,7 @@
 
     PUPPET
 
-    apply_and_test_idempotence(pp)
+    idempotent_apply(pp)
 
     describe file('/tmp/say_hi') do
       it { is_expected.not_to exist }

spec/acceptance/install_remove_spec.rb

@@ -10,7 +10,7 @@
 
     PUPPET
 
-    apply_and_test_idempotence(pp)
+    idempotent_apply(pp)
 
     describe package('cron') do
       it { is_expected.to be_installed }
@@ -44,7 +44,7 @@ class { 'cron':
 
     PUPPET
 
-    apply_and_test_idempotence(pp)
+    idempotent_apply(pp)
 
     describe package('cron') do
       it { is_expected.not_to be_installed }

spec/acceptance/purge_cron_spec.rb

@@ -18,7 +18,7 @@
 
     PUPPET
 
-    apply_and_test_idempotence(pp)
+    idempotent_apply(pp)
 
     describe cron do
       it { is_expected.to have_entry '* * * * * /usr/bin/backup' }
@@ -45,7 +45,7 @@
 
     PUPPET
 
-    apply_and_test_idempotence(pp)
+    idempotent_apply(pp)
 
     describe cron do
       it { is_expected.to have_entry '* * * * * /usr/bin/backup' }

spec/acceptance/regular_user_crontab_spec.rb

@@ -12,7 +12,7 @@
 
     PUPPET
 
-    apply_and_test_idempotence pp
+    idempotent_apply pp
 
     describe command('sudo -u luke env EDITOR=cat crontab -e') do
       its(:exit_status) { is_expected.to eq 1 }
@@ -31,7 +31,7 @@ class { 'cron':
 
     PUPPET
 
-    apply_and_test_idempotence pp
+    idempotent_apply pp
 
     describe command('sudo -u luke env EDITOR=cat crontab -e') do
       its(:exit_status) { is_expected.to eq 0 }
@@ -47,7 +47,7 @@ class { 'cron':
 
     PUPPET
 
-    apply_and_test_idempotence pp
+    idempotent_apply pp
 
     describe user('luke') do
       it { is_expected.not_to exist }

spec/acceptance/whitelist_spec.rb

@@ -14,7 +14,7 @@ class { 'cron':
   PUPPET
 
   context 'whitelist a cron job in /etc/cron.d' do
-    apply_and_test_idempotence(pp)
+    idempotent_apply(pp)
   end
 
   context 'fake a cron job and see that it is not purged' do

spec/spec_helper_acceptance.rb

@@ -1,33 +1,31 @@
 # frozen_string_literal: true
 
-require 'beaker-rspec'
-require 'beaker-puppet'
-require 'beaker/puppet_install_helper'
-require 'beaker/module_install_helper'
-
-run_puppet_install_helper
-install_module_on(hosts)
-install_module_dependencies_on(hosts)
+require 'serverspec'
+require 'puppet_litmus'
+include PuppetLitmus # rubocop:disable Style/MixinUsage
 
 RSpec.configure do |c|
   c.color     = true
   c.formatter = :documentation
 end
 
-# This runs the supplied manifest twice on the host.
-#
-# First time checking for failures.
-# Second time checking for changes.
-#
-# Idempotent and clean. Just the way I like it.
-def apply_and_test_idempotence(manifest)
-  context 'applying manifest and testing for idempotence' do
-    it 'does not fail the first time around' do
-      apply_manifest(manifest, catch_failures: true)
-    end
+if ENV['TARGET_HOST'].nil? || ENV['TARGET_HOST'] == 'localhost'
+  puts 'Running tests against this machine !'
+  set :backend, :exec
+else
+  inventory_hash = inventory_hash_from_inventory_file
+  node_config = config_from_node(inventory_hash, ENV['TARGET_HOST'])
 
-    it 'does not change anything on the second run' do
-      apply_manifest(manifest, catch_changes: true)
-    end
+  if target_in_group(inventory_hash, ENV['TARGET_HOST'], 'ssh_nodes')
+    set :backend, :ssh
+    options = Net::SSH::Config.for(host)
+    options[:user] = node_config.dig('ssh', 'user') unless node_config.dig('ssh', 'user').nil?
+    options[:port] = node_config.dig('ssh', 'port') unless node_config.dig('ssh', 'port').nil?
+    options[:password] = node_config.dig('ssh', 'password') unless node_config.dig('ssh', 'password').nil?
+    options[:verify_host_key] = Net::SSH::Verifiers::Always.new unless node_config.dig('ssh', 'host-key-check').nil?
+    host = ENV['TARGET_HOST'].split(':').first
+    set :host,        options[:host_name] || host
+    set :ssh_options, options
+    set :request_pty, true
   end
 end