Pre-install foreman-selinux in acceptance environment#1041
Pre-install foreman-selinux in acceptance environment#1041wbclark wants to merge 1 commit intotheforeman:masterfrom
Conversation
| ensure => latest, | ||
| require => Class['foreman::repo'], | ||
| } | ||
|
|
| require => Class['foreman::repo'], | ||
| } | ||
|
|
||
| if $foreman::repo::configure_scl_repo { |
There was a problem hiding this comment.
| if $foreman::repo::configure_scl_repo { | |
| if $foreman::repo::configure_scl_repo { |
| ensure => installed, | ||
| require => Class['foreman::repo'], | ||
| } | ||
| } |
There was a problem hiding this comment.
This whole block is indented too far I think. And you'll have a trailing } on line 18.
There was a problem hiding this comment.
It was my intention to have the rh-redis5-redis package inside if $facts['os']['selinux']['enabled'] { ... } because of the existing comment on L#5: # Needed for idempotency when SELinux is enabled (which now conveniently applies to both package resources)
IMO it was an oversight that this wasn't already conditioned on selinux being enabled.
I thought about making the change in a separate commit but it seemed too minor to warrant it. That would have made this easier to review but probably the git log clutter is not worth it when this only affects tests.
What do you think?
There was a problem hiding this comment.
That works. Can you rebase on latest master branch to ensure tests pass?
wbclark
force-pushed
the
selinux_indempotence
branch
from
c87c467 to
c7fbee0
Compare
|
Hey @ehelms , I triggered the tests to run again. The failures on Ubuntu look non-related: |
|
Yeah, ubuntu 20.04 tests are busted. |
Also do not purge foreman-selinux between tests. This is a workaround for the Puppet issue [PUP-10548].
ehelms
force-pushed
the
selinux_indempotence
branch
from
c7fbee0 to
f340ecf
Compare
| def purge_foreman | ||
| case fact('osfamily') | ||
| when 'RedHat' | ||
| on default, 'yum -y remove foreman* tfm-*' |
There was a problem hiding this comment.
Isn't there a way to exclude a package in yum/dnf remove?
5 participants
Also do not purge foreman-selinux between tests. This is a workaround
for the Puppet issue [PUP-10548].