Merge pull request #2340 from ekohl/setup-acceptance-node

Extract acceptance node setup to a separate file

Author: david22swan

spec/setup_acceptance_node.pp

@@ -0,0 +1,36 @@
+# needed by tests
+package { 'curl':
+  ensure => 'latest',
+}
+
+case $facts['os']['family'] {
+  'SLES', 'SUSE': {
+    # needed for netstat, for serverspec checks
+    package { 'net-tools-deprecated':
+      ensure => 'latest',
+    }
+  }
+  'RedHat': {
+    # Make sure selinux is disabled so the tests work.
+    if $facts['os']['selinux']['enabled'] {
+      exec { 'setenforce 0':
+        path => $facts['path'],
+      }
+    }
+
+    if versioncmp($facts['os']['release']['major'], '8') >= 0 {
+      package { 'iproute':
+        ensure => installed,
+      }
+    }
+    include epel
+  }
+  'Debian': {
+    if $facts['os']['name'] == 'Debian' and versioncmp($facts['os']['release']['major'], '11') >= 0 {
+      # Ensure ipv6 is enabled on our Debian 11 Docker boxes
+      exec { 'sysctl -w net.ipv6.conf.all.disable_ipv6=0':
+        path => $facts['path'],
+      }
+    }
+  }
+}

spec/spec_helper_acceptance_local.rb

@@ -34,48 +34,10 @@ def print_parsing_errors
   end
   c.before :suite do
     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
+      LitmusHelper.instance.run_shell('puppet module install puppet/epel')
     end
 
-    pp = <<-PUPPETCODE
-    # needed by tests
-    package { 'curl':
-      ensure   => 'latest',
-    }
-    # needed for netstat, for serverspec checks
-    if $::osfamily == 'SLES' or $::osfamily == 'SUSE' {
-      package { 'net-tools-deprecated':
-        ensure   => 'latest',
-      }
-    }
-    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",
-        }
-      } else {
-        class { 'epel': }
-      }
-    }
-    PUPPETCODE
-    LitmusHelper.instance.apply_manifest(pp)
-
-    # Ensure ipv6 is enabled on our Debian 11 Docker boxes
-    LitmusHelper.instance.run_shell('sysctl -w net.ipv6.conf.all.disable_ipv6=0') if %r{debian}.match?(os[:family]) && os[:release].to_f == 11
-
-    # Install iproute on AlmaLinux
-    # Package is used to check if ports are listening
-    LitmusHelper.instance.run_shell('sudo dnf install iproute -y') if %r{redhat}.match?(os[:family]) && os[:release].to_f >= 8
+    LitmusHelper.instance.apply_manifest(File.read(File.join(__dir__, 'setup_acceptance_node.pp')))
   end
 
   c.after :suite do