From 8e6997971222a1a445cb8c7e4643262c8e467637 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Tue, 21 May 2024 09:03:29 +0200 Subject: [PATCH] drop old EL7 test specialcases --- spec/defines/foreman_plugin_spec.rb | 2 +- spec/support/acceptance/purge.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/defines/foreman_plugin_spec.rb b/spec/defines/foreman_plugin_spec.rb index 7bcaaf670..01399c497 100644 --- a/spec/defines/foreman_plugin_spec.rb +++ b/spec/defines/foreman_plugin_spec.rb @@ -14,7 +14,7 @@ context 'no parameters' do package_name = case facts[:osfamily] when 'RedHat' - facts[:os]['release']['major'] == '7' ? 'tfm-rubygem-foreman_myplugin' : 'rubygem-foreman_myplugin' + 'rubygem-foreman_myplugin' when 'Debian' 'ruby-foreman-myplugin' end diff --git a/spec/support/acceptance/purge.rb b/spec/support/acceptance/purge.rb index 601a0c56c..7522048b1 100644 --- 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, 'yum -y remove foreman*' 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] }