Pre-install foreman-selinux in acceptance environment

Also do not purge foreman-selinux between tests. This is a workaround for the Puppet issue [PUP-10548].
theforeman · Apr 25, 2022 · f340ecf · f340ecf
1 parent 1d28765
commit f340ecf
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/spec/setup_acceptance_node.pp b/spec/setup_acceptance_node.pp
@@ -3,11 +3,18 @@
 }
 
 # Needed for idempotency when SELinux is enabled
-if $foreman::repo::configure_scl_repo {
-  package { 'rh-redis5-redis':
-    ensure  => installed,
+if $facts['os']['selinux']['enabled'] {
+  package { 'foreman-selinux':
+    ensure  => latest,
     require => Class['foreman::repo'],
   }
+
+  if $foreman::repo::configure_scl_repo {
+    package { 'rh-redis5-redis':
+      ensure  => installed,
+      require => Class['foreman::repo'],
+    }
+  }
 }
 
 # Not /etc/foreman because purging removes that

diff --git a/spec/support/acceptance/purge.rb b/spec/support/acceptance/purge.rb
@@ -1,7 +1,7 @@
 def purge_foreman
   case fact('osfamily')
   when 'RedHat'
-    on default, 'yum -y remove foreman* tfm-*'
+    on default, 'rpm -qa | grep -P \'^tfm|^foreman(?!-selinux)\' | xargs yum -y remove'
   when 'Debian'
     on default, 'apt-get purge -y foreman*', { :acceptable_exit_codes => [0, 100] }
     on default, 'apt-get purge -y ruby-hammer-cli-*', { :acceptable_exit_codes => [0, 100] }