From eefd80a0c75d6f93a132b7c51d5b4d3d066bfa49 Mon Sep 17 00:00:00 2001
From: William Bradford Clark <wclark@redhat.com>
Date: Mon, 30 Mar 2020 11:31:24 -0400
Subject: [PATCH] Fixes #29195 - puppet-certs should run on el8

---
 .sync.yml                      |  1 +
 .travis.yml                    | 22 ++++++++++++++++++++++
 Gemfile                        |  1 +
 spec/spec_helper_acceptance.rb | 16 ++++++++++++++--
 4 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/.sync.yml b/.sync.yml
index 95d8812c..3ee7c5bb 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -5,6 +5,7 @@
 .travis.yml:
   beaker_sets:
   - centos7-64
+  - centos8-64
   test_all_rvms: false
 Rakefile:
   param_docs_pattern:
diff --git a/.travis.yml b/.travis.yml
index fa7fbffa..fdf78168 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,5 +31,27 @@ matrix:
         - echo '{"ipv6":true,"fixed-cidr-v6":"2001:db8:1::/64"}' | sudo tee /etc/docker/daemon.json
         - sudo service docker restart
 
+    - rvm: 2.5.1
+      env:
+        - BEAKER_PUPPET_COLLECTION=puppet5
+        - BEAKER_setfile=centos8-64{hostname=centos8-64.example.com}
+      script: bundle exec rake beaker
+      services: docker
+      bundler_args: --without development
+      before_install:
+        - echo '{"ipv6":true,"fixed-cidr-v6":"2001:db8:1::/64"}' | sudo tee /etc/docker/daemon.json
+        - sudo service docker restart
+
+    - rvm: 2.5.1
+      env:
+        - BEAKER_PUPPET_COLLECTION=puppet6
+        - BEAKER_setfile=centos8-64{hostname=centos8-64.example.com}
+      script: bundle exec rake beaker
+      services: docker
+      bundler_args: --without development
+      before_install:
+        - echo '{"ipv6":true,"fixed-cidr-v6":"2001:db8:1::/64"}' | sudo tee /etc/docker/daemon.json
+        - sudo service docker restart
+
 bundler_args: --without system_tests development
 dist: xenial
diff --git a/Gemfile b/Gemfile
index e471b9ec..987d858d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -31,6 +31,7 @@ gem 'beaker-docker', {"groups"=>["system_tests"]}
 gem 'beaker-hostgenerator', '>= 1.1.10', {"groups"=>["system_tests"]}
 gem 'beaker-puppet', {"groups"=>["system_tests"]}
 gem 'beaker-rspec', {"groups"=>["system_tests"]}
+gem 'beaker-vagrant', {"groups"=>["system_tests"]}
 gem 'beaker-module_install_helper', {"groups"=>["system_tests"]}
 gem 'beaker-puppet_install_helper', {"groups"=>["system_tests"]}
 gem 'metadata-json-lint'
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 212f2ec0..c3b6f5f5 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -22,14 +22,26 @@
   c.before :suite do
     # Install module and dependencies
     hosts.each do |host|
-      if fact_on(host, 'osfamily') == 'RedHat'
+      if fact_on(host, 'os.family') == 'RedHat'
         # don't delete downloaded rpm for use with BEAKER_provision=no +
         # BEAKER_destroy=no
         on host, 'sed -i "s/keepcache=.*/keepcache=1/" /etc/yum.conf'
         # refresh check if cache needs refresh on next yum command
         on host, 'yum clean expire-cache'
+
+        major = fact_on(host, 'os.release.major')
+
+        if major == '8'
+          on host, puppet('resource', 'package', 'glibc-langpack-en', 'ensure=installed')
+        end
         # foreman nightly provides katello-cert-tools
-        host.install_package('https://yum.theforeman.org/releases/nightly/el7/x86_64/foreman-release.rpm')
+        baseurl = if ENV['FOREMAN_REPO_RELEASE']
+                    "https://yum.theforeman.org/releases/nightly/el#{major}/x86_64/"
+                  else
+                    "http://koji.katello.org/releases/yum/foreman-nightly/RHEL/#{major}/x86_64/"
+                  end
+
+        on host, puppet_resource('yumrepo', 'foreman', "baseurl=#{baseurl}", 'gpgcheck=0')
       end
     end
   end