Merge pull request #2243 from ekohl/fix-epel-in-acceptance

Acceptance tests: correct EPEL usage

Author: david22swan

spec/acceptance/mod_authnz_ldap_spec.rb

@@ -6,12 +6,6 @@
 # We need to restrict this test to RHEL 7.x, 8.x derived OSs as there are too many unique
 # dependency issues to solve on all supported platforms.
 describe 'apache::mod::authnz_ldap', if: mod_supported_on_platform?('apache::mod::authnz_ldap') do
-  before(:each) do
-    if os[:family] == 'redhat'
-      run_shell('yum clean all') # To clear some issues when configuring EPEL / Optional repos
-      run_shell('dnf install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm -y') if os[:release].to_i == 8
-    end
-  end
   context 'Default mod_authnz_ldap module installation' do
     pp = if run_shell("grep 'Oracle Linux Server' /etc/os-release", expect_failures: true).exit_status == 0
            <<-MANIFEST
@@ -27,9 +21,6 @@ class { 'apache::mod::authnz_ldap': }
       MANIFEST
          else
            <<-MANIFEST
-        package { 'epel-release':
-          ensure => present,
-        }
         class { 'apache': }
         class { 'apache::mod::authnz_ldap': }
         MANIFEST

spec/spec_helper_acceptance_local.rb

@@ -33,10 +33,18 @@ def print_parsing_errors
     c.filter_run_excluding ipv6: true
   end
   c.before :suite do
-    # Make sure selinux is disabled so the tests work.
-    LitmusHelper.instance.run_shell('setenforce 0', expect_failures: true) if %r{redhat|oracle}.match?(os[:family])
+    if %r{redhat|oracle}.match?(os[:family])
+      # Make sure selinux is disabled so the tests work.
+      LitmusHelper.instance.run_shell('setenforce 0', expect_failures: true)
+
+      # Version 4.0.0 drops EL6 support
+      if os[:release].to_i <= 6
+        LitmusHelper.instance.run_shell('puppet module install --version 3.1.0 puppet/epel')
+      else
+        LitmusHelper.instance.run_shell('puppet module install puppet/epel')
+      end
+    end
 
-    LitmusHelper.instance.run_shell('puppet module install stahnma/epel')
     pp = <<-PUPPETCODE
     # needed by tests
     package { 'curl':
@@ -49,17 +57,12 @@ def print_parsing_errors
       }
     }
     if $::osfamily == 'RedHat' {
+      # EPEL < 7 is EOL and removed from the official mirror network
       if $::operatingsystemmajrelease == '5' or $::operatingsystemmajrelease == '6'{
         class { 'epel':
           epel_baseurl => "http://osmirror.delivery.puppetlabs.net/epel${::operatingsystemmajrelease}-\\$basearch/RPMS.all",
           epel_mirrorlist => "http://osmirror.delivery.puppetlabs.net/epel${::operatingsystemmajrelease}-\\$basearch/RPMS.all",
         }
-      } elsif $::operatingsystemmajrelease == '8' {
-          class { 'epel':
-                os_maj_release => "7",
-                epel_baseurl => "http://osmirror.delivery.puppetlabs.net/epel7-\\$basearch/RPMS.all",
-                epel_mirrorlist => "http://osmirror.delivery.puppetlabs.net/epel7-\\$basearch/RPMS.all",
-          }
       } else {
         class { 'epel': }
       }