diff --git a/spec/acceptance/mod_authnz_ldap_spec.rb b/spec/acceptance/mod_authnz_ldap_spec.rb index ef59b6a5b0..82615ab624 100644 --- a/spec/acceptance/mod_authnz_ldap_spec.rb +++ b/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 diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb index 2cb26b135d..3d27d291c2 100644 --- a/spec/spec_helper_acceptance_local.rb +++ b/spec/spec_helper_acceptance_local.rb @@ -34,9 +34,12 @@ def print_parsing_errors 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]) + LitmusHelper.instance.run_shell('setenforce 0', expect_failures: true) if os[:family] == 'RedHat' LitmusHelper.instance.run_shell('puppet module install stahnma/epel') + + LitmusHelper.instance.run_shell('yum-config-manager --disable rhui-rhel-7-server-rhui-debug-rpms') if os[:name] == 'RedHat' && os[:release].to_i == 7 + pp = <<-PUPPETCODE # needed by tests package { 'curl':