Updates to testing matrix.

.travis.yml

@@ -1,148 +1,179 @@
 sudo: required
-group: deprecated-2017Q4
 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
+
 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
-    - 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
-    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
+    # Intake jobs
+    - stage: intake
+      env:
+      - TASK=intake
+    - env:
+      - TASK=intake
+      - PUPPET_VERSION='~> 5.0'
+
+    # Acceptance test jobs
+    - stage: acceptance
+      env:
+        - 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:
+      - 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
+
 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=

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'
@@ -42,13 +42,19 @@ end
 
 group :development do
   gem 'puppet-blacksmith'
+  gem 'irb'
 end
 
 group :system_tests do
   gem 'bcrypt'
-  gem 'beaker', '~> 3.7'
+  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 'simp-beaker-helpers'
   gem 'vault'
 end

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?

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

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
+