From 58f95fc6c3d7ea55531962442b93c5026943abbd Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.co.uk>
Date: Tue, 16 Jun 2020 16:24:49 +0100
Subject: [PATCH] (IAC-890) - Implement CentOS 8 travis tests

---
 .sync.yml      |  1 +
 .travis.yml    | 28 ++++++++++++++++++++++------
 Gemfile        |  2 --
 metadata.json  |  4 ++--
 provision.yaml |  3 +++
 5 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/.sync.yml b/.sync.yml
index cdac38a..59c4737 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -14,6 +14,7 @@
     - ---travis_el
     - travis_deb
     - travis_el7
+    - travis_el8
     complex:
     - collection:
         puppet_collection:
diff --git a/.travis.yml b/.travis.yml
index 6377e75..f128034 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,7 +33,6 @@ jobs:
       - "bundle exec rake 'litmus:install_agent[puppet6]'"
       - "bundle exec rake litmus:install_module"
       bundler_args:
-      dist: trusty
       env: PLATFORMS=travis_ub_6_puppet6
       rvm: 2.5.7
       script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
@@ -45,7 +44,6 @@ jobs:
       - "bundle exec rake 'litmus:install_agent[puppet5]'"
       - "bundle exec rake litmus:install_module"
       bundler_args:
-      dist: trusty
       env: PLATFORMS=travis_ub_5_puppet5
       rvm: 2.5.7
       script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
@@ -57,7 +55,6 @@ jobs:
       - "bundle exec rake 'litmus:install_agent[puppet5]'"
       - "bundle exec rake litmus:install_module"
       bundler_args:
-      dist: trusty
       env: PLATFORMS=travis_deb_puppet5
       rvm: 2.5.7
       script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
@@ -69,19 +66,28 @@ jobs:
       - "bundle exec rake 'litmus:install_agent[puppet5]'"
       - "bundle exec rake litmus:install_module"
       bundler_args:
-      dist: trusty
       env: PLATFORMS=travis_el7_puppet5
       rvm: 2.5.7
       script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
+    -
+      before_script:
+      - "bundle exec rake 'litmus:provision_list[travis_el8]'"
+      - "bundle exec rake 'litmus:install_agent[puppet5]'"
+      - "bundle exec rake litmus:install_module"
+      bundler_args:
+      env: PLATFORMS=travis_el8_puppet5
+      rvm: 2.5.7
+      script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
+      services: docker
+      stage: acceptance
     -
       before_script:
       - "bundle exec rake 'litmus:provision_list[travis_deb]'"
       - "bundle exec rake 'litmus:install_agent[puppet6]'"
       - "bundle exec rake litmus:install_module"
       bundler_args:
-      dist: trusty
       env: PLATFORMS=travis_deb_puppet6
       rvm: 2.5.7
       script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
@@ -93,12 +99,22 @@ jobs:
       - "bundle exec rake 'litmus:install_agent[puppet6]'"
       - "bundle exec rake litmus:install_module"
       bundler_args:
-      dist: trusty
       env: PLATFORMS=travis_el7_puppet6
       rvm: 2.5.7
       script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
+    -
+      before_script:
+      - "bundle exec rake 'litmus:provision_list[travis_el8]'"
+      - "bundle exec rake 'litmus:install_agent[puppet6]'"
+      - "bundle exec rake litmus:install_module"
+      bundler_args:
+      env: PLATFORMS=travis_el8_puppet6
+      rvm: 2.5.7
+      script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
+      services: docker
+      stage: acceptance
     -
       env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint"
       stage: static
diff --git a/Gemfile b/Gemfile
index adbbe6d..4f6e33b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -29,8 +29,6 @@ group :development do
   gem "puppet-module-win-default-r#{minor_version}", '~> 0.4',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "puppet-module-win-dev-r#{minor_version}", '~> 0.4',       require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "github_changelog_generator",                              require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
-  gem 'ed25519', '>= 1.2', '< 2.0'
-  gem 'bcrypt_pbkdf', '>= 1.0', '< 2.0'
 end
 
 puppet_version = ENV['PUPPET_GEM_VERSION']
diff --git a/metadata.json b/metadata.json
index 510ad0e..3dacee2 100644
--- a/metadata.json
+++ b/metadata.json
@@ -79,6 +79,6 @@
     }
   ],
   "template-url": "https://github.com/puppetlabs/pdk-templates#master",
-  "template-ref": "heads/master-0-g88b05c7",
-  "pdk-version": "1.17.0"
+  "template-ref": "heads/master-0-g9c14433",
+  "pdk-version": "1.18.0"
 }
diff --git a/provision.yaml b/provision.yaml
index cdc3839..4eb1963 100644
--- a/provision.yaml
+++ b/provision.yaml
@@ -20,6 +20,9 @@ travis_el6:
 travis_el7:
   provisioner: docker
   images: ['litmusimage/centos:7']
+travis_el8:
+  provisioner: docker
+  images: ['litmusimage/centos:8']
 release_checks_5:
   provisioner: abs
   images: ['redhat-5-x86_64', 'redhat-6-x86_64', 'redhat-7-x86_64', 'redhat-8-x86_64', 'centos-5-x86_64', 'centos-6-x86_64', 'centos-7-x86_64', 'centos-8-x86_64', 'oracle-6-x86_64', 'scientific-6-x86_64', 'scientific-7-x86_64', 'debian-8-x86_64', 'debian-9-x86_64', 'debian-10-x86_64', 'sles-12-x86_64', 'sles-15-x86_64', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64']
-- 
2.45.2