From f9e2467fd539a12662a265308967ec48655cdad4 Mon Sep 17 00:00:00 2001
From: Gavin Williams <gavin.williams@elastic.co>
Date: Thu, 6 Feb 2020 10:30:35 +0000
Subject: [PATCH 01/15] Various testing cleanups.

* Default to Puppet `6.x`
* Remove Puppet `4.x` from testing
* Update Elasticsearch default test version to `6.8.6`
* Remove Elasticsearch `2.x` from testing
---
 .travis.yml | 24 ------------------------
 Gemfile     |  2 +-
 Rakefile    |  2 +-
 3 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8e03da626..bd410f35d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,70 +45,46 @@ jobs:
   - stage: intake
     env:
     - TASK=intake
-    - PUPPET_VERSION='~> 4.10.0'
-  - env:
-    - TASK=intake
   - env:
     - TASK=intake
     - PUPPET_VERSION='~> 5.0'
-  - env:
-    - TASK=intake
-    - PUPPET_VERSION='~> 6.0'
   - stage: acceptance
     env:
     - TASK=beaker:centos-6-x64:acceptance
   - env:
     - TASK=beaker:centos-6-x64:acceptance[5.6.9]
-  - env:
-    - TASK=beaker:centos-6-x64:acceptance[2.4.6]
   - env:
     - TASK=beaker:centos-7-x64:acceptance
   - env:
     - TASK=beaker:centos-7-x64:acceptance[5.6.9]
-  - env:
-    - TASK=beaker:centos-7-x64:acceptance[2.4.6]
   - env:
     - TASK=beaker:amazonlinux-1-x64:acceptance
   - env:
     - TASK=beaker:amazonlinux-1-x64:acceptance[5.6.9]
-  - env:
-    - TASK=beaker:amazonlinux-1-x64:acceptance[2.4.6]
   - env:
     - TASK=beaker:oracle-6-x64:acceptance
   - env:
     - TASK=beaker:oracle-6-x64:acceptance[5.6.9]
-  - env:
-    - TASK=beaker:oracle-6-x64:acceptance[2.4.6]
   - env:
     - TASK=beaker:oracle-7-x64:acceptance
   - env:
     - TASK=beaker:oracle-7-x64:acceptance[5.6.9]
-  - env:
-    - TASK=beaker:oracle-7-x64:acceptance[2.4.6]
   - env:
     - TASK=beaker:debian-8-x64:acceptance
   - env:
     - TASK=beaker:debian-8-x64:acceptance[5.6.9]
-  - env:
-    - TASK=beaker:debian-8-x64:acceptance[2.4.6]
   - env:
     - TASK=beaker:debian-9-x64:acceptance
   - env:
     - TASK=beaker:debian-9-x64:acceptance[5.6.9]
-  - env:
-    - TASK=beaker:debian-9-x64:acceptance[2.4.6]
   - env:
     - TASK=beaker:ubuntu-server-1404-x64:acceptance
   - env:
     - TASK=beaker:ubuntu-server-1404-x64:acceptance[5.6.9]
-  - env:
-    - TASK=beaker:ubuntu-server-1404-x64:acceptance[2.4.6]
   - env:
     - TASK=beaker:ubuntu-server-1604-x64:acceptance
   - env:
     - TASK=beaker:ubuntu-server-1604-x64:acceptance[5.6.9]
-  - env:
-    - TASK=beaker:ubuntu-server-1604-x64:acceptance[2.4.6]
   - stage: snapshots
     env:
     - TASK=beaker:ubuntu-server-1404-x64:snapshot
diff --git a/Gemfile b/Gemfile
index fc7ad6178..4adb56670 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 group :test do
-  gem 'puppet', (ENV['PUPPET_VERSION'] || '~> 4.10'), :require => false
+  gem 'puppet', (ENV['PUPPET_VERSION'] || '~> 6.0'), :require => false
 
   gem 'metadata-json-lint'
   gem 'specinfra', '~> 2.60'
diff --git a/Rakefile b/Rakefile
index 797ee0213..f453bd560 100644
--- a/Rakefile
+++ b/Rakefile
@@ -137,7 +137,7 @@ beaker_node_sets.each do |node|
     "beaker:#{node}:acceptance", [:version, :filter] => [:spec_prep]
   ) do |task, args|
     ENV['BEAKER_set'] = node
-    args.with_defaults(:version => '6.2.3', :filter => nil)
+    args.with_defaults(:version => '6.8.6', :filter => nil)
     task.pattern = 'spec/acceptance/tests/acceptance_spec.rb'
     task.rspec_opts = []
     task.rspec_opts << '--format documentation' if ENV['CI'].nil?

From 6f3437d333bbfec6bc4b86b0aaf9d8039dfd1245 Mon Sep 17 00:00:00 2001
From: Gavin Williams <gavin.williams@elastic.co>
Date: Thu, 6 Feb 2020 10:46:55 +0000
Subject: [PATCH 02/15] Add OS tests for CentOS 8, Debian 10 and Ubuntu 18.04

---
 .travis.yml                                   | 12 ++++++++++++
 spec/acceptance/nodesets/centos-8-x64.yml     | 19 +++++++++++++++++++
 spec/acceptance/nodesets/debian-10-x64.yml    | 14 ++++++++++++++
 .../nodesets/ubuntu-server-1804-x64.yml       | 16 ++++++++++++++++
 4 files changed, 61 insertions(+)
 create mode 100644 spec/acceptance/nodesets/centos-8-x64.yml
 create mode 100644 spec/acceptance/nodesets/debian-10-x64.yml
 create mode 100644 spec/acceptance/nodesets/ubuntu-server-1804-x64.yml

diff --git a/.travis.yml b/.travis.yml
index bd410f35d..b3a994642 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,6 +57,10 @@ jobs:
     - TASK=beaker:centos-7-x64:acceptance
   - env:
     - TASK=beaker:centos-7-x64:acceptance[5.6.9]
+  - env:
+    - TASK=beaker:centos-8-x64:acceptance
+  - env:
+    - TASK=beaker:centos-8-x64:acceptance[5.6.9]
   - env:
     - TASK=beaker:amazonlinux-1-x64:acceptance
   - env:
@@ -77,6 +81,10 @@ jobs:
     - TASK=beaker:debian-9-x64:acceptance
   - env:
     - TASK=beaker:debian-9-x64:acceptance[5.6.9]
+  - env:
+    - TASK=beaker:debian-10-x64:acceptance
+  - env:
+    - TASK=beaker:debian-10-x64:acceptance[5.6.9]
   - env:
     - TASK=beaker:ubuntu-server-1404-x64:acceptance
   - env:
@@ -85,6 +93,10 @@ jobs:
     - TASK=beaker:ubuntu-server-1604-x64:acceptance
   - env:
     - TASK=beaker:ubuntu-server-1604-x64:acceptance[5.6.9]
+  - env:
+    - TASK=beaker:ubuntu-server-1804-x64:acceptance
+  - env:
+    - TASK=beaker:ubuntu-server-1804-x64:acceptance[5.6.9]
   - stage: snapshots
     env:
     - TASK=beaker:ubuntu-server-1404-x64:snapshot
diff --git a/spec/acceptance/nodesets/centos-8-x64.yml b/spec/acceptance/nodesets/centos-8-x64.yml
new file mode 100644
index 000000000..e2268242c
--- /dev/null
+++ b/spec/acceptance/nodesets/centos-8-x64.yml
@@ -0,0 +1,19 @@
+HOSTS:
+  centos-8-x64:
+    roles:
+      - master
+      - database
+      - dashboard
+    platform: el-8-x86_64
+    image: centos:8
+    hypervisor: docker
+    docker_cmd: ["/sbin/init"]
+    docker_preserve_image: true
+    docker_image_commands:
+      - yum install -y wget which cronie iproute
+      - mkdir -p /etc/selinux/targeted/contexts/
+      - echo '<busconfig><selinux></selinux></busconfig>' > /etc/selinux/targeted/contexts/dbus_contexts
+      - rm /lib/systemd/system/systemd*udev*
+      - rm /lib/systemd/system/getty.target
+CONFIG:
+  log_level: warn
diff --git a/spec/acceptance/nodesets/debian-10-x64.yml b/spec/acceptance/nodesets/debian-10-x64.yml
new file mode 100644
index 000000000..311ed4396
--- /dev/null
+++ b/spec/acceptance/nodesets/debian-10-x64.yml
@@ -0,0 +1,14 @@
+HOSTS:
+  debian-10:
+    roles:
+      - agent
+    platform: debian-10-amd64
+    image: debian:10
+    hypervisor: docker
+    docker_cmd: ["/bin/systemd"]
+    docker_preserve_image: true
+    docker_image_commands:
+      - apt-get install -yq apt-transport-https openjdk-8-jre-headless wget net-tools gpg ruby-augeas
+CONFIG:
+  log_level: warn
+
diff --git a/spec/acceptance/nodesets/ubuntu-server-1804-x64.yml b/spec/acceptance/nodesets/ubuntu-server-1804-x64.yml
new file mode 100644
index 000000000..3742654d3
--- /dev/null
+++ b/spec/acceptance/nodesets/ubuntu-server-1804-x64.yml
@@ -0,0 +1,16 @@
+HOSTS:
+  ubuntu-18-04:
+    roles:
+      - master
+      - database
+      - dashboard
+    platform: ubuntu-18.04-amd64
+    image: ubuntu:18.04
+    hypervisor: docker
+    docker_cmd: ["/sbin/init"]
+    docker_preserve_image: true
+    docker_image_commands:
+      - apt-get update
+      - apt-get install -yq libssl-dev puppet apt-transport-https
+CONFIG:
+  log_level: warn

From 5fd9768ecaebbb1eec3693278041f29b1409c3cc Mon Sep 17 00:00:00 2001
From: Gavin Williams <gavin.williams@elastic.co>
Date: Fri, 7 Feb 2020 11:01:45 +0000
Subject: [PATCH 03/15] Bump the version of Beaker

---
 Gemfile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 4adb56670..9a634cb10 100644
--- a/Gemfile
+++ b/Gemfile
@@ -46,8 +46,11 @@ end
 
 group :system_tests do
   gem 'bcrypt'
-  gem 'beaker', '~> 3.7'
-  gem 'beaker-rspec', '~> 6.0'
+  gem 'beaker', '>= 4.2.0', :require => false
+  gem 'beaker-rspec', '~> 6.0', :require => false
+  gem 'beaker-docker', :require => false
+  gem 'beaker-puppet', :require => false
+  gem 'beaker-puppet_install_helper', :require => false
   gem 'docker-api', '~> 1.0'
   gem 'infrataster'
   gem 'vault'

From 5d37770e295c55928dcb5f0d671cd222f9aff40f Mon Sep 17 00:00:00 2001
From: Gavin Williams <gavin.williams@elastic.co>
Date: Fri, 7 Feb 2020 11:42:09 +0000
Subject: [PATCH 04/15] Require 'beaker-puppet'

---
 spec/spec_helper_acceptance.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 63d60b6e1..3d70a788e 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -1,4 +1,5 @@
 require 'beaker-rspec'
+require 'beaker-puppet'
 require 'securerandom'
 require 'thread'
 require 'infrataster/rspec'

From e7eba8a4929500954a0d0e8a0c1670f3291ca3b3 Mon Sep 17 00:00:00 2001
From: Gavin Williams <gavin.williams@elastic.co>
Date: Fri, 7 Feb 2020 13:07:24 +0000
Subject: [PATCH 05/15] Updating 'spec_helper_acceptance' following Gem version
 bumps

---
 spec/spec_helper_acceptance.rb | 86 ++++++++++++++++++----------------
 1 file changed, 46 insertions(+), 40 deletions(-)

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 3d70a788e..ff3177a22 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -1,5 +1,7 @@
-require 'beaker-rspec'
 require 'beaker-puppet'
+require 'beaker-rspec'
+require 'beaker/puppet_install_helper'
+# require 'beaker/module_install_helper'
 require 'securerandom'
 require 'thread'
 require 'infrataster/rspec'
@@ -15,6 +17,8 @@ def f
   RSpec.configuration.fact
 end
 
+run_puppet_install_helper unless ENV['BEAKER_provision'] == 'no'
+
 RSpec.configure do |c|
   # General-purpose spec-global variables
   c.add_setting :v, :default => {}
@@ -148,47 +152,49 @@ class { 'elasticsearch':
   # Set the host to 'aio' in order to adopt the puppet-agent style of
   # installation, and configure paths/etc.
   host[:type] = 'aio'
-  configure_defaults_on host, 'aio'
-
-  # Install Puppet
-  #
-  # We spawn a thread to print dots periodically while installing puppet to
-  # avoid inactivity timeouts in Travis. Don't judge me.
-  progress = Thread.new do
-    print 'Installing puppet..'
-    print '.' while sleep 5
-  end
-
-  case host.name
-  when /debian-9/
-    # A few special cases need to be installed from gems (if the distro is
-    # very new and has no puppet repo package or has no upstream packages).
-    install_puppet_from_gem(
-      host,
-      version: Gem.loaded_specs['puppet'].version
-    )
-  else
-    # Otherwise, just use the all-in-one agent package.
-    install_puppet_agent_on(
-      host,
-      puppet_agent_version: to_agent_version(Gem.loaded_specs['puppet'].version)
-    )
-  end
-  # Quit the print thread and include some debugging.
-  progress.exit
-  puts "done. Installed version #{shell('puppet --version').output}"
-
-  RSpec.configure do |c|
-    c.add_setting :fact, :default => JSON.parse(fact('', '-j'))
-  end
-
-  if f['os']['family'] == 'Suse'
+  # configure_defaults_on host, 'aio'
+
+  # # Install Puppet
+  # #
+  # # We spawn a thread to print dots periodically while installing puppet to
+  # # avoid inactivity timeouts in Travis. Don't judge me.
+  # progress = Thread.new do
+  #   print 'Installing puppet..'
+  #   print '.' while sleep 5
+  # end
+
+  # case host.name
+  # when /debian-9/
+  #   # A few special cases need to be installed from gems (if the distro is
+  #   # very new and has no puppet repo package or has no upstream packages).
+  #   install_puppet_from_gem(
+  #     host,
+  #     version: Gem.loaded_specs['puppet'].version
+  #   )
+  # else
+  #   # Otherwise, just use the all-in-one agent package.
+  #   install_puppet_agent_on(
+  #     host,
+  #     puppet_agent_version: to_agent_version(Gem.loaded_specs['puppet'].version)
+  #   )
+  # end
+  # # Quit the print thread and include some debugging.
+  # progress.exit
+  puts "Installed version #{shell('puppet --version').output}"
+
+  # RSpec.configure do |c|
+  #   c.add_setting :fact, :default => JSON.parse(fact('', '-j'))
+  # end
+
+  # if f['os']['family'] == 'Suse'
+  if fact('os.family') == 'Suse'
     install_package host,
                     '--force-resolution augeas-devel libxml2-devel ruby-devel'
     on host, 'gem install ruby-augeas --no-ri --no-rdoc'
   end
 
-  v[:ext] = case f['os']['family']
+  # Set correct OS package extension
+  v[:ext] = case fact('os.family')
             when 'Debian'
               'deb'
             else
@@ -238,7 +244,7 @@ class { 'elasticsearch':
         'Debian' => ['apt'],
         'Suse'   => ['zypprepo'],
         'RedHat' => %w[concat yumrepo_core]
-      }[f['os']['family']]
+      }[fact('os.family')]
 
       modules += dist_module unless dist_module.nil?
 
@@ -253,12 +259,12 @@ class { 'elasticsearch':
       on(host, 'mkdir -p etc/puppet/modules/another/files/')
 
       # Apt doesn't update package caches sometimes, ensure we're caught up.
-      shell 'apt-get update' if f['os']['family'] == 'Debian'
+      shell 'apt-get update' if fact('os.family') == 'Debian'
     end
 
     # Use the Java class once before the suite of tests
     unless shell('command -v java', :accept_all_exit_codes => true).exit_code.zero?
-      java = case f['os']['name']
+      java = case fact('os.family')
              when 'OpenSuSE'
                'package => "java-1_8_0-openjdk-headless",'
              else

From 80efc0a4233606e6de5a63425cb97b3dff404356 Mon Sep 17 00:00:00 2001
From: Gavin Williams <gavin.williams@elastic.co>
Date: Fri, 7 Feb 2020 13:28:38 +0000
Subject: [PATCH 06/15] Use a recent Travis image

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b3a994642..935968a29 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,4 @@
 sudo: required
-group: deprecated-2017Q4
 services:
 - docker
 cache:

From 983a61a69305a6fae115405e2e38b9743491f393 Mon Sep 17 00:00:00 2001
From: Gavin Williams <gavin.williams@elastic.co>
Date: Fri, 7 Feb 2020 14:55:18 +0000
Subject: [PATCH 07/15] Default to 'agent' puppet install

---
 spec/spec_helper_acceptance.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index ff3177a22..70000de5c 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -17,7 +17,7 @@ def f
   RSpec.configuration.fact
 end
 
-run_puppet_install_helper unless ENV['BEAKER_provision'] == 'no'
+run_puppet_install_helper('agent') unless ENV['BEAKER_provision'] == 'no'
 
 RSpec.configure do |c|
   # General-purpose spec-global variables

From 92f3511af3621f9688a64ab400f0bdf767497653 Mon Sep 17 00:00:00 2001
From: Gavin Williams <gavin.williams@elastic.co>
Date: Fri, 7 Feb 2020 14:55:44 +0000
Subject: [PATCH 08/15] More tweaks to travis config

---
 .travis.yml | 223 ++++++++++++++++++++++++----------------------------
 1 file changed, 104 insertions(+), 119 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 935968a29..40987f7fd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,132 +1,117 @@
 sudo: required
 services:
-- docker
+  - docker
 cache:
   bundler: true
   directories:
-  - spec/fixtures/artifacts
-  - spec/fixtures/modules
+    - spec/fixtures/artifacts
+    - spec/fixtures/modules
 language: ruby
 script: travis_retry bundle exec rake $TASK
+
+stages:
+  - intake
+  - acceptance
+  - snapshot
+
+# Acceptance test matrix
+env:
+  - TASK=beaker:centos-6-x64:acceptance
+  - TASK=beaker:centos-6-x64:acceptance[5.6.9]
+  - TASK=beaker:centos-7-x64:acceptance
+  - TASK=beaker:centos-7-x64:acceptance[5.6.9]
+  - TASK=beaker:centos-8-x64:acceptance
+  - TASK=beaker:centos-8-x64:acceptance[5.6.9]
+  - TASK=beaker:amazonlinux-1-x64:acceptance
+  - TASK=beaker:amazonlinux-1-x64:acceptance[5.6.9]
+  - TASK=beaker:oracle-6-x64:acceptance
+  - TASK=beaker:oracle-6-x64:acceptance[5.6.9]
+  - TASK=beaker:oracle-7-x64:acceptance
+  - TASK=beaker:oracle-7-x64:acceptance[5.6.9]
+  - TASK=beaker:debian-8-x64:acceptance
+  - TASK=beaker:debian-8-x64:acceptance[5.6.9]
+  - TASK=beaker:debian-9-x64:acceptance
+  - TASK=beaker:debian-9-x64:acceptance[5.6.9]
+  - TASK=beaker:debian-10-x64:acceptance
+  - TASK=beaker:debian-10-x64:acceptance[5.6.9]
+  - TASK=beaker:ubuntu-server-1404-x64:acceptance
+  - TASK=beaker:ubuntu-server-1404-x64:acceptance[5.6.9]
+  - TASK=beaker:ubuntu-server-1604-x64:acceptance
+  - TASK=beaker:ubuntu-server-1604-x64:acceptance[5.6.9]
+  - TASK=beaker:ubuntu-server-1804-x64:acceptance
+  - TASK=beaker:ubuntu-server-1804-x64:acceptance[5.6.9]
+
 jobs:
   allow_failures:
-  - env:
-    - TASK=beaker:ubuntu-server-1404-x64:snapshot
-  - env:
-    - OSS_PACKAGE=true
-    - TASK=beaker:ubuntu-server-1404-x64:snapshot
-  - env:
-    - TASK=beaker:ubuntu-server-1604-x64:snapshot
-  - env:
-    - OSS_PACKAGE=true
-    - TASK=beaker:ubuntu-server-1604-x64:snapshot
-  - env:
-    - TASK=beaker:centos-6-x64:snapshot
-  - env:
-    - OSS_PACKAGE=true
-    - TASK=beaker:centos-6-x64:snapshot
-  - env:
-    - TASK=beaker:centos-7-x64:snapshot
-  - env:
-    - OSS_PACKAGE=true
-    - TASK=beaker:centos-7-x64:snapshot
-  - env:
-    - TASK=beaker:debian-8-x64:snapshot
-  - env:
-    - OSS_PACKAGE=true
-    - TASK=beaker:debian-8-x64:snapshot
-  - env:
-    - TASK=beaker:debian-9-x64:snapshot
-  - env:
-    - OSS_PACKAGE=true
-    - TASK=beaker:debian-9-x64:snapshot
+    - env:
+      - TASK=beaker:ubuntu-server-1404-x64:snapshot
+    - env:
+      - OSS_PACKAGE=true
+      - TASK=beaker:ubuntu-server-1404-x64:snapshot
+    - env:
+      - TASK=beaker:ubuntu-server-1604-x64:snapshot
+    - env:
+      - OSS_PACKAGE=true
+      - TASK=beaker:ubuntu-server-1604-x64:snapshot
+    - env:
+      - TASK=beaker:centos-6-x64:snapshot
+    - env:
+      - OSS_PACKAGE=true
+      - TASK=beaker:centos-6-x64:snapshot
+    - env:
+      - TASK=beaker:centos-7-x64:snapshot
+    - env:
+      - OSS_PACKAGE=true
+      - TASK=beaker:centos-7-x64:snapshot
+    - env:
+      - TASK=beaker:debian-8-x64:snapshot
+    - env:
+      - OSS_PACKAGE=true
+      - TASK=beaker:debian-8-x64:snapshot
+    - env:
+      - TASK=beaker:debian-9-x64:snapshot
+    - env:
+      - OSS_PACKAGE=true
+      - TASK=beaker:debian-9-x64:snapshot
   include:
-  - stage: intake
-    env:
-    - TASK=intake
-  - env:
-    - TASK=intake
-    - PUPPET_VERSION='~> 5.0'
-  - stage: acceptance
-    env:
-    - TASK=beaker:centos-6-x64:acceptance
-  - env:
-    - TASK=beaker:centos-6-x64:acceptance[5.6.9]
-  - env:
-    - TASK=beaker:centos-7-x64:acceptance
-  - env:
-    - TASK=beaker:centos-7-x64:acceptance[5.6.9]
-  - env:
-    - TASK=beaker:centos-8-x64:acceptance
-  - env:
-    - TASK=beaker:centos-8-x64:acceptance[5.6.9]
-  - env:
-    - TASK=beaker:amazonlinux-1-x64:acceptance
-  - env:
-    - TASK=beaker:amazonlinux-1-x64:acceptance[5.6.9]
-  - env:
-    - TASK=beaker:oracle-6-x64:acceptance
-  - env:
-    - TASK=beaker:oracle-6-x64:acceptance[5.6.9]
-  - env:
-    - TASK=beaker:oracle-7-x64:acceptance
-  - env:
-    - TASK=beaker:oracle-7-x64:acceptance[5.6.9]
-  - env:
-    - TASK=beaker:debian-8-x64:acceptance
-  - env:
-    - TASK=beaker:debian-8-x64:acceptance[5.6.9]
-  - env:
-    - TASK=beaker:debian-9-x64:acceptance
-  - env:
-    - TASK=beaker:debian-9-x64:acceptance[5.6.9]
-  - env:
-    - TASK=beaker:debian-10-x64:acceptance
-  - env:
-    - TASK=beaker:debian-10-x64:acceptance[5.6.9]
-  - env:
-    - TASK=beaker:ubuntu-server-1404-x64:acceptance
-  - env:
-    - TASK=beaker:ubuntu-server-1404-x64:acceptance[5.6.9]
-  - env:
-    - TASK=beaker:ubuntu-server-1604-x64:acceptance
-  - env:
-    - TASK=beaker:ubuntu-server-1604-x64:acceptance[5.6.9]
-  - env:
-    - TASK=beaker:ubuntu-server-1804-x64:acceptance
-  - env:
-    - TASK=beaker:ubuntu-server-1804-x64:acceptance[5.6.9]
-  - stage: snapshots
-    env:
-    - TASK=beaker:ubuntu-server-1404-x64:snapshot
-    env:
-    - OSS_PACKAGE=true
-    - TASK=beaker:ubuntu-server-1404-x64:snapshot
-  - env:
-    - TASK=beaker:ubuntu-server-1604-x64:snapshot
-  - env:
-    - OSS_PACKAGE=true
-    - TASK=beaker:ubuntu-server-1604-x64:snapshot
-  - env:
-    - TASK=beaker:centos-6-x64:snapshot
-  - env:
-    - OSS_PACKAGE=true
-    - TASK=beaker:centos-6-x64:snapshot
-  - env:
-    - TASK=beaker:centos-7-x64:snapshot
-  - env:
-    - OSS_PACKAGE=true
-    - TASK=beaker:centos-7-x64:snapshot
-  - env:
-    - TASK=beaker:debian-8-x64:snapshot
-  - env:
-    - OSS_PACKAGE=true
-    - TASK=beaker:debian-8-x64:snapshot
-  - env:
-    - TASK=beaker:debian-9-x64:snapshot
-  - env:
-    - OSS_PACKAGE=true
-    - TASK=beaker:debian-9-x64:snapshot
+    - stage: intake
+      env:
+      - TASK=intake
+    - env:
+      - TASK=intake
+      - PUPPET_VERSION='~> 5.0'
+    - stage: snapshots
+      env:
+      - TASK=beaker:ubuntu-server-1404-x64:snapshot
+      env:
+      - OSS_PACKAGE=true
+      - TASK=beaker:ubuntu-server-1404-x64:snapshot
+    - env:
+      - TASK=beaker:ubuntu-server-1604-x64:snapshot
+    - env:
+      - OSS_PACKAGE=true
+      - TASK=beaker:ubuntu-server-1604-x64:snapshot
+    - env:
+      - TASK=beaker:centos-6-x64:snapshot
+    - env:
+      - OSS_PACKAGE=true
+      - TASK=beaker:centos-6-x64:snapshot
+    - env:
+      - TASK=beaker:centos-7-x64:snapshot
+    - env:
+      - OSS_PACKAGE=true
+      - TASK=beaker:centos-7-x64:snapshot
+    - env:
+      - TASK=beaker:debian-8-x64:snapshot
+    - env:
+      - OSS_PACKAGE=true
+      - TASK=beaker:debian-8-x64:snapshot
+    - env:
+      - TASK=beaker:debian-9-x64:snapshot
+    - env:
+      - OSS_PACKAGE=true
+      - TASK=beaker:debian-9-x64:snapshot
+
 notifications:
   slack:
     secure: T1FO+ttrJNH+bXmNR6349qcttG68Qr1xmMqVVRnUr7+129GQO5174Z8MFC8ck0qOCZGHO7GCNO5seNFflrjF/5EKbdkmVnqhf9gVa9kN7I4psMzxJX9bp29xJA6m3wA4VqCosDKVFSfilDZujAblWT+KDHZLjP8sEWEnHPvCjf69S2XDQEWUoxZan5V9IJQas4XR+hMdIZTA3ChVrEyqRfeehAZImbAr/LH8zChZaTdHZQY7p2rN3+qVNi3+GISV9fNPpOCynnX/ACbdUaRt3+1etxGGaQMPzGmTejN3VlMw4OZRXImb6HQ2rXE+fNCASXiKiwylxTbriQsS0dFv4skxH03YlYM8pqaBpeIOwzf4n45tTzdAQZJMC5cOb+RvwS7qkAwuaVlVxiiA+MWRG/UcFpWS+iNn4KEKxbpBjYP8X1JIP9DlHLME7DNMM2pePv9X6ZjY6eDhVM1gbKi77dXOo5y2Sp0ru8QkLpIKFVXS01O+x7oDHHv2Osvih0jNMgM66Byso3KJYJ6EJ0D2/3Q9ZNpVM4CMuIY5pBQfXf691zqkBHI6JUnU6VMw97cH0k6Gq0ypZoW5trXdnRC5aEg4jKKid84zKmAeTpj/iMuagyb/a5msJstIVboynRtfDHR0J8WWhfSU2wzqKAb6L66iyRe62Fe8OGzLhk2+KNU=

From 15bcf160a7811d37897056d661000309e1f897b9 Mon Sep 17 00:00:00 2001
From: Gavin Williams <gavin.williams@elastic.co>
Date: Fri, 7 Feb 2020 15:27:53 +0000
Subject: [PATCH 09/15] Travis.yml tweak to include acceptance stage

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 40987f7fd..332077cc0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -80,6 +80,7 @@ jobs:
     - env:
       - TASK=intake
       - PUPPET_VERSION='~> 5.0'
+    - stage: acceptance
     - stage: snapshots
       env:
       - TASK=beaker:ubuntu-server-1404-x64:snapshot

From 13f4ee9e64a8d4072a81155849343b2036e7f9cb Mon Sep 17 00:00:00 2001
From: Gavin Williams <gavin.williams@elastic.co>
Date: Fri, 7 Feb 2020 15:43:06 +0000
Subject: [PATCH 10/15] Rework matrix again

---
 .travis.yml | 90 +++++++++++++++++++++++++++++++++--------------------
 1 file changed, 56 insertions(+), 34 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 332077cc0..18cf54b78 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,38 +9,6 @@ cache:
 language: ruby
 script: travis_retry bundle exec rake $TASK
 
-stages:
-  - intake
-  - acceptance
-  - snapshot
-
-# Acceptance test matrix
-env:
-  - TASK=beaker:centos-6-x64:acceptance
-  - TASK=beaker:centos-6-x64:acceptance[5.6.9]
-  - TASK=beaker:centos-7-x64:acceptance
-  - TASK=beaker:centos-7-x64:acceptance[5.6.9]
-  - TASK=beaker:centos-8-x64:acceptance
-  - TASK=beaker:centos-8-x64:acceptance[5.6.9]
-  - TASK=beaker:amazonlinux-1-x64:acceptance
-  - TASK=beaker:amazonlinux-1-x64:acceptance[5.6.9]
-  - TASK=beaker:oracle-6-x64:acceptance
-  - TASK=beaker:oracle-6-x64:acceptance[5.6.9]
-  - TASK=beaker:oracle-7-x64:acceptance
-  - TASK=beaker:oracle-7-x64:acceptance[5.6.9]
-  - TASK=beaker:debian-8-x64:acceptance
-  - TASK=beaker:debian-8-x64:acceptance[5.6.9]
-  - TASK=beaker:debian-9-x64:acceptance
-  - TASK=beaker:debian-9-x64:acceptance[5.6.9]
-  - TASK=beaker:debian-10-x64:acceptance
-  - TASK=beaker:debian-10-x64:acceptance[5.6.9]
-  - TASK=beaker:ubuntu-server-1404-x64:acceptance
-  - TASK=beaker:ubuntu-server-1404-x64:acceptance[5.6.9]
-  - TASK=beaker:ubuntu-server-1604-x64:acceptance
-  - TASK=beaker:ubuntu-server-1604-x64:acceptance[5.6.9]
-  - TASK=beaker:ubuntu-server-1804-x64:acceptance
-  - TASK=beaker:ubuntu-server-1804-x64:acceptance[5.6.9]
-
 jobs:
   allow_failures:
     - env:
@@ -74,17 +42,70 @@ jobs:
       - OSS_PACKAGE=true
       - TASK=beaker:debian-9-x64:snapshot
   include:
+    # Intake jobs
     - stage: intake
       env:
       - TASK=intake
     - env:
       - TASK=intake
       - PUPPET_VERSION='~> 5.0'
+
+    # Acceptance test jobs
     - stage: acceptance
-    - stage: snapshots
       env:
-      - TASK=beaker:ubuntu-server-1404-x64:snapshot
+      - TASK=beaker:centos-6-x64:acceptance
+    - env:
+      - TASK=beaker:centos-6-x64:acceptance[5.6.9]
+    - env:
+      - TASK=beaker:centos-7-x64:acceptance
+    - env:
+      - TASK=beaker:centos-7-x64:acceptance[5.6.9]
+    - env:
+      - TASK=beaker:centos-8-x64:acceptance
+    - env:
+      - TASK=beaker:centos-8-x64:acceptance[5.6.9]
+    - env:
+      - TASK=beaker:amazonlinux-1-x64:acceptance
+    - env:
+      - TASK=beaker:amazonlinux-1-x64:acceptance[5.6.9]
+    - env:
+      - TASK=beaker:oracle-6-x64:acceptance
+    - env:
+      - TASK=beaker:oracle-6-x64:acceptance[5.6.9]
+    - env:
+      - TASK=beaker:oracle-7-x64:acceptance
+    - env:
+      - TASK=beaker:oracle-7-x64:acceptance[5.6.9]
+    - env:
+      - TASK=beaker:debian-8-x64:acceptance
+    - env:
+      - TASK=beaker:debian-8-x64:acceptance[5.6.9]
+    - env:
+      - TASK=beaker:debian-9-x64:acceptance
+    - env:
+      - TASK=beaker:debian-9-x64:acceptance[5.6.9]
+    - env:
+      - TASK=beaker:debian-10-x64:acceptance
+    - env:
+      - TASK=beaker:debian-10-x64:acceptance[5.6.9]
+    - env:
+      - TASK=beaker:ubuntu-server-1404-x64:acceptance
+    - env:
+      - TASK=beaker:ubuntu-server-1404-x64:acceptance[5.6.9]
+    - env:
+      - TASK=beaker:ubuntu-server-1604-x64:acceptance
+    - env:
+      - TASK=beaker:ubuntu-server-1604-x64:acceptance[5.6.9]
+    - env:
+      - TASK=beaker:ubuntu-server-1804-x64:acceptance
+    - env:
+      - TASK=beaker:ubuntu-server-1804-x64:acceptance[5.6.9]
+
+    # Snapshot tests
+    - stage: snapshots
       env:
+        - TASK=beaker:ubuntu-server-1404-x64:snapshot
+    - env:
       - OSS_PACKAGE=true
       - TASK=beaker:ubuntu-server-1404-x64:snapshot
     - env:
@@ -116,6 +137,7 @@ jobs:
 notifications:
   slack:
     secure: T1FO+ttrJNH+bXmNR6349qcttG68Qr1xmMqVVRnUr7+129GQO5174Z8MFC8ck0qOCZGHO7GCNO5seNFflrjF/5EKbdkmVnqhf9gVa9kN7I4psMzxJX9bp29xJA6m3wA4VqCosDKVFSfilDZujAblWT+KDHZLjP8sEWEnHPvCjf69S2XDQEWUoxZan5V9IJQas4XR+hMdIZTA3ChVrEyqRfeehAZImbAr/LH8zChZaTdHZQY7p2rN3+qVNi3+GISV9fNPpOCynnX/ACbdUaRt3+1etxGGaQMPzGmTejN3VlMw4OZRXImb6HQ2rXE+fNCASXiKiwylxTbriQsS0dFv4skxH03YlYM8pqaBpeIOwzf4n45tTzdAQZJMC5cOb+RvwS7qkAwuaVlVxiiA+MWRG/UcFpWS+iNn4KEKxbpBjYP8X1JIP9DlHLME7DNMM2pePv9X6ZjY6eDhVM1gbKi77dXOo5y2Sp0ru8QkLpIKFVXS01O+x7oDHHv2Osvih0jNMgM66Byso3KJYJ6EJ0D2/3Q9ZNpVM4CMuIY5pBQfXf691zqkBHI6JUnU6VMw97cH0k6Gq0ypZoW5trXdnRC5aEg4jKKid84zKmAeTpj/iMuagyb/a5msJstIVboynRtfDHR0J8WWhfSU2wzqKAb6L66iyRe62Fe8OGzLhk2+KNU=
+
 env:
   global:
   - secure: WFFcjwBIRBG2zyk4c8Ugq0tgI1YaH/+s5eV9h3i2kR1ggobT+nrNqn3hCOkmPtwGYPBNjVj6yp+7qy//MRe8AS2eo1XuMD/P4MYcDGmZiMnqPhz1UsLltGTYlh3y6jl9DJvNujFBQMnAu/ey2g/iWrcHdtl2qninvN3wOrXi2Bs=

From 9410382b8732b451fc99c2bcd90acbc31d014c6a Mon Sep 17 00:00:00 2001
From: Gavin Williams <gavin.williams@elastic.co>
Date: Tue, 11 Feb 2020 13:57:34 +0000
Subject: [PATCH 11/15] Set BEAKER_PUPPET_COLLECTION

---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 18cf54b78..9cc7751c3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -53,8 +53,10 @@ jobs:
     # Acceptance test jobs
     - stage: acceptance
       env:
-      - TASK=beaker:centos-6-x64:acceptance
+        - BEAKER_PUPPET_COLLECTION=puppet6
+        - TASK=beaker:centos-6-x64:acceptance
     - env:
+      - BEAKER_PUPPET_COLLECTION=puppet6
       - TASK=beaker:centos-6-x64:acceptance[5.6.9]
     - env:
       - TASK=beaker:centos-7-x64:acceptance

From fe98014ba411643c9d125c26503483caa99b000f Mon Sep 17 00:00:00 2001
From: Gavin Williams <gavin.williams@elastic.co>
Date: Mon, 24 Feb 2020 14:11:28 +0000
Subject: [PATCH 12/15] More tweaks to matrix and deps

---
 .travis.yml                    | 34 ++++++++++++++++++++++++++++++++++
 Gemfile                        |  1 +
 spec/spec_helper_acceptance.rb | 17 +++++++++++------
 3 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9cc7751c3..77932cb40 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -59,80 +59,114 @@ jobs:
       - BEAKER_PUPPET_COLLECTION=puppet6
       - TASK=beaker:centos-6-x64:acceptance[5.6.9]
     - env:
+      - BEAKER_PUPPET_COLLECTION=puppet6
       - TASK=beaker:centos-7-x64:acceptance
     - env:
+      - BEAKER_PUPPET_COLLECTION=puppet6
       - TASK=beaker:centos-7-x64:acceptance[5.6.9]
     - env:
+      - BEAKER_PUPPET_COLLECTION=puppet6
       - TASK=beaker:centos-8-x64:acceptance
     - env:
+      - BEAKER_PUPPET_COLLECTION=puppet6
       - TASK=beaker:centos-8-x64:acceptance[5.6.9]
     - env:
+      - BEAKER_PUPPET_COLLECTION=puppet6
       - TASK=beaker:amazonlinux-1-x64:acceptance
     - env:
+      - BEAKER_PUPPET_COLLECTION=puppet6
       - TASK=beaker:amazonlinux-1-x64:acceptance[5.6.9]
     - env:
+      - BEAKER_PUPPET_COLLECTION=puppet6
       - TASK=beaker:oracle-6-x64:acceptance
     - env:
+      - BEAKER_PUPPET_COLLECTION=puppet6
       - TASK=beaker:oracle-6-x64:acceptance[5.6.9]
     - env:
+      - BEAKER_PUPPET_COLLECTION=puppet6
       - TASK=beaker:oracle-7-x64:acceptance
     - env:
+      - BEAKER_PUPPET_COLLECTION=puppet6
       - TASK=beaker:oracle-7-x64:acceptance[5.6.9]
     - env:
+      - BEAKER_PUPPET_COLLECTION=puppet6
       - TASK=beaker:debian-8-x64:acceptance
     - env:
+      - BEAKER_PUPPET_COLLECTION=puppet6
       - TASK=beaker:debian-8-x64:acceptance[5.6.9]
     - env:
+      - BEAKER_PUPPET_COLLECTION=puppet6
       - TASK=beaker:debian-9-x64:acceptance
     - env:
+      - BEAKER_PUPPET_COLLECTION=puppet6
       - TASK=beaker:debian-9-x64:acceptance[5.6.9]
     - env:
+      - BEAKER_PUPPET_COLLECTION=puppet6
       - TASK=beaker:debian-10-x64:acceptance
     - env:
+      - BEAKER_PUPPET_COLLECTION=puppet6
       - TASK=beaker:debian-10-x64:acceptance[5.6.9]
     - env:
+      - BEAKER_PUPPET_COLLECTION=puppet6
       - TASK=beaker:ubuntu-server-1404-x64:acceptance
     - env:
+      - BEAKER_PUPPET_COLLECTION=puppet6
       - TASK=beaker:ubuntu-server-1404-x64:acceptance[5.6.9]
     - env:
+      - BEAKER_PUPPET_COLLECTION=puppet6
       - TASK=beaker:ubuntu-server-1604-x64:acceptance
     - env:
+      - BEAKER_PUPPET_COLLECTION=puppet6
       - TASK=beaker:ubuntu-server-1604-x64:acceptance[5.6.9]
     - env:
+      - BEAKER_PUPPET_COLLECTION=puppet6
       - TASK=beaker:ubuntu-server-1804-x64:acceptance
     - env:
+      - BEAKER_PUPPET_COLLECTION=puppet6
       - TASK=beaker:ubuntu-server-1804-x64:acceptance[5.6.9]
 
     # Snapshot tests
     - stage: snapshots
       env:
+        - BEAKER_PUPPET_COLLECTION=puppet6
         - TASK=beaker:ubuntu-server-1404-x64:snapshot
     - env:
+      - BEAKER_PUPPET_COLLECTION=puppet6
       - OSS_PACKAGE=true
       - TASK=beaker:ubuntu-server-1404-x64:snapshot
     - env:
+      - BEAKER_PUPPET_COLLECTION=puppet6
       - TASK=beaker:ubuntu-server-1604-x64:snapshot
     - env:
+      - BEAKER_PUPPET_COLLECTION=puppet6
       - OSS_PACKAGE=true
       - TASK=beaker:ubuntu-server-1604-x64:snapshot
     - env:
+      - BEAKER_PUPPET_COLLECTION=puppet6
       - TASK=beaker:centos-6-x64:snapshot
     - env:
+      - BEAKER_PUPPET_COLLECTION=puppet6
       - OSS_PACKAGE=true
       - TASK=beaker:centos-6-x64:snapshot
     - env:
+      - BEAKER_PUPPET_COLLECTION=puppet6
       - TASK=beaker:centos-7-x64:snapshot
     - env:
+      - BEAKER_PUPPET_COLLECTION=puppet6
       - OSS_PACKAGE=true
       - TASK=beaker:centos-7-x64:snapshot
     - env:
+      - BEAKER_PUPPET_COLLECTION=puppet6
       - TASK=beaker:debian-8-x64:snapshot
     - env:
+      - BEAKER_PUPPET_COLLECTION=puppet6
       - OSS_PACKAGE=true
       - TASK=beaker:debian-8-x64:snapshot
     - env:
+      - BEAKER_PUPPET_COLLECTION=puppet6
       - TASK=beaker:debian-9-x64:snapshot
     - env:
+      - BEAKER_PUPPET_COLLECTION=puppet6
       - OSS_PACKAGE=true
       - TASK=beaker:debian-9-x64:snapshot
 
diff --git a/Gemfile b/Gemfile
index 9a634cb10..e114d09ab 100644
--- a/Gemfile
+++ b/Gemfile
@@ -49,6 +49,7 @@ group :system_tests do
   gem 'beaker', '>= 4.2.0', :require => false
   gem 'beaker-rspec', '~> 6.0', :require => false
   gem 'beaker-docker', :require => false
+  gem 'beaker-hiera', :require => false
   gem 'beaker-puppet', :require => false
   gem 'beaker-puppet_install_helper', :require => false
   gem 'docker-api', '~> 1.0'
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 70000de5c..b43431e2e 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -1,5 +1,8 @@
-require 'beaker-puppet'
-require 'beaker-rspec'
+require 'beaker-hiera'
+# require 'beaker-puppet'
+# require 'beaker-rspec'
+require 'beaker-rspec/spec_helper'
+require 'beaker-rspec/helpers/serverspec'
 require 'beaker/puppet_install_helper'
 # require 'beaker/module_install_helper'
 require 'securerandom'
@@ -13,16 +16,18 @@
 require_relative '../lib/puppet_x/elastic/deep_to_i'
 require_relative '../lib/puppet_x/elastic/deep_to_s'
 
-def f
-  RSpec.configuration.fact
-end
+# def f
+#   RSpec.configuration.fact
+# end
 
-run_puppet_install_helper('agent') unless ENV['BEAKER_provision'] == 'no'
+run_puppet_install_helper(type='agent') unless ENV['BEAKER_provision'] == 'no'
 
 RSpec.configure do |c|
   # General-purpose spec-global variables
   c.add_setting :v, :default => {}
 
+  c.formatter = :documentation
+
   unless ENV['snapshot_version'].nil?
     v[:snapshot_version] = ENV['snapshot_version']
     v[:is_snapshot] = ENV['SNAPSHOT_TEST'] == 'true'

From aea95c354a7148ca01e6f43a7d465238488e553a Mon Sep 17 00:00:00 2001
From: Gavin Williams <gavin.williams@elastic.co>
Date: Wed, 26 Feb 2020 10:21:31 +0000
Subject: [PATCH 13/15] Fix syntax error on 'run_puppet_install_helper'

---
 spec/spec_helper_acceptance.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index b43431e2e..8df7399b9 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -20,7 +20,7 @@
 #   RSpec.configuration.fact
 # end
 
-run_puppet_install_helper(type='agent') unless ENV['BEAKER_provision'] == 'no'
+run_puppet_install_helper('agent') unless ENV['BEAKER_provision'] == 'no'
 
 RSpec.configure do |c|
   # General-purpose spec-global variables

From dd73fdba36892bdb05110a8ff4997b2963391b95 Mon Sep 17 00:00:00 2001
From: Gavin Williams <gavin.williams@elastic.co>
Date: Mon, 9 Mar 2020 11:41:54 +0000
Subject: [PATCH 14/15] Require everything...

---
 Gemfile | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index e114d09ab..7aad84ea6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -42,16 +42,17 @@ end
 
 group :development do
   gem 'puppet-blacksmith'
+  gem 'irb'
 end
 
 group :system_tests do
   gem 'bcrypt'
-  gem 'beaker', '>= 4.2.0', :require => false
-  gem 'beaker-rspec', '~> 6.0', :require => false
-  gem 'beaker-docker', :require => false
-  gem 'beaker-hiera', :require => false
-  gem 'beaker-puppet', :require => false
-  gem 'beaker-puppet_install_helper', :require => false
+  gem 'beaker', '>= 4.2.0'
+  gem 'beaker-rspec', '~> 6.0'
+  gem 'beaker-docker'
+  gem 'beaker-hiera'
+  gem 'beaker-puppet'
+  gem 'beaker-puppet_install_helper'
   gem 'docker-api', '~> 1.0'
   gem 'infrataster'
   gem 'vault'

From 3684127f45d5b0bc27532806f9d6279b2533c854 Mon Sep 17 00:00:00 2001
From: Gavin Williams <gavin.williams@elastic.co>
Date: Mon, 9 Mar 2020 12:30:40 +0000
Subject: [PATCH 15/15] Try 'simp-beaker-helpers'

---
 Gemfile                        | 1 +
 spec/spec_helper_acceptance.rb | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/Gemfile b/Gemfile
index 7aad84ea6..dc187e04c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -55,5 +55,6 @@ group :system_tests do
   gem 'beaker-puppet_install_helper'
   gem 'docker-api', '~> 1.0'
   gem 'infrataster'
+  gem 'simp-beaker-helpers'
   gem 'vault'
 end
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 8df7399b9..fcca63e61 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -1,3 +1,6 @@
+require 'simp/beaker_helpers'
+include Simp::BeakerHelpers
+
 require 'beaker-hiera'
 # require 'beaker-puppet'
 # require 'beaker-rspec'