From 48daadbea64ce63cf495a271eb3b71dd6336ffd5 Mon Sep 17 00:00:00 2001 From: sheena Date: Thu, 22 Jul 2021 11:16:53 +0100 Subject: [PATCH 1/5] (maint) nightly test failure son Redhat-7 --- spec/spec_helper_acceptance_local.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb index 2cb26b135d..b52aef8c7c 100644 --- a/spec/spec_helper_acceptance_local.rb +++ b/spec/spec_helper_acceptance_local.rb @@ -37,6 +37,8 @@ def print_parsing_errors LitmusHelper.instance.run_shell('setenforce 0', expect_failures: true) if %r{redhat|oracle}.match?(os[:family]) 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[:family] == 'redhat' && os[:release].to_f == 7 pp = <<-PUPPETCODE # needed by tests package { 'curl': From 6cfd4e2cc26254dc0f2627cd45fc24c6a2046e77 Mon Sep 17 00:00:00 2001 From: sheenaajay Date: Thu, 22 Jul 2021 12:51:39 +0100 Subject: [PATCH 2/5] Update spec/spec_helper_acceptance_local.rb Co-authored-by: Ewoud Kohl van Wijngaarden --- spec/spec_helper_acceptance_local.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb index b52aef8c7c..80998aaae9 100644 --- a/spec/spec_helper_acceptance_local.rb +++ b/spec/spec_helper_acceptance_local.rb @@ -38,7 +38,7 @@ def print_parsing_errors 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[:family] == 'redhat' && os[:release].to_f == 7 + LitmusHelper.instance.run_shell('yum-config-manager --disable rhui-rhel-7-server-rhui-debug-rpms') if os[:family] == 'redhat' && os[:release].to_i == 7 pp = <<-PUPPETCODE # needed by tests package { 'curl': From e943092ce9c4f77676212dc3934c85dcc7237642 Mon Sep 17 00:00:00 2001 From: sheena Date: Thu, 22 Jul 2021 13:18:38 +0100 Subject: [PATCH 3/5] (maint) incorporate review comments --- spec/spec_helper_acceptance_local.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb index 80998aaae9..991b700f53 100644 --- a/spec/spec_helper_acceptance_local.rb +++ b/spec/spec_helper_acceptance_local.rb @@ -34,11 +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 %r{redhat}.match?(os[:family]) 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[:family] == 'redhat' && os[:release].to_i == 7 + 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': From f2ba9a78346b1e242b2bf9e7aa026e9ca1e0b779 Mon Sep 17 00:00:00 2001 From: sheenaajay Date: Thu, 22 Jul 2021 13:28:56 +0100 Subject: [PATCH 4/5] Update spec/spec_helper_acceptance_local.rb Co-authored-by: Ewoud Kohl van Wijngaarden --- spec/spec_helper_acceptance_local.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb index 991b700f53..3d27d291c2 100644 --- a/spec/spec_helper_acceptance_local.rb +++ b/spec/spec_helper_acceptance_local.rb @@ -34,7 +34,7 @@ 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}.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') From 900d1bd6cb244c28e632bda9412cc75a84eca9c4 Mon Sep 17 00:00:00 2001 From: sheena Date: Thu, 22 Jul 2021 14:26:27 +0100 Subject: [PATCH 5/5] (maint) update mod_authnz_ldap test --- spec/acceptance/mod_authnz_ldap_spec.rb | 9 --------- 1 file changed, 9 deletions(-) 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