Skip to content

Commit e742650

Browse files
committed
(FM-8029) Add RedHat 8 support
1 parent c7da528 commit e742650

File tree

3 files changed

+2
-144
lines changed

3 files changed

+2
-144
lines changed

metadata.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
"operatingsystemrelease": [
2424
"5",
2525
"6",
26-
"7"
26+
"7",
27+
"8"
2728
]
2829
},
2930
{

spec/acceptance/locales_spec.rb

Lines changed: 0 additions & 111 deletions
This file was deleted.

spec/spec_helper_acceptance.rb

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -30,38 +30,6 @@ def idempotent_apply(hosts, manifest, opts = {}, &block)
3030
end
3131
end
3232

33-
RSpec.configure do |c|
34-
# Readable test descriptions
35-
c.formatter = :documentation
36-
37-
# detect the situation where PUP-5016 is triggered and skip the idempotency tests in that case
38-
# also note how fact('puppetversion') is not available because of PUP-4359
39-
if os[:family] == 'debian' && os[:release].to_i == 8 && shell('puppet --version').stdout =~ %r{^4\.2}
40-
c.filter_run_excluding skip_pup_5016: true
41-
end
42-
43-
# Configure all nodes in nodeset
44-
c.before :suite do
45-
run_puppet_access_login(user: 'admin') if pe_install? && (Gem::Version.new(puppet_version) >= Gem::Version.new('5.0.0'))
46-
hosts.each do |host|
47-
# This will be removed, this is temporary to test localisation.
48-
49-
if os[:family] == 'debian'
50-
# install language on debian systems
51-
install_language_on(host, 'ja_JP.utf-8') if not_controller(host)
52-
# This will be removed, this is temporary to test localisation.
53-
end
54-
# Required for binding tests.
55-
if os[:family] == 'redhat'
56-
if os[:release].to_i == 7 || os[:family] == 'fedora'
57-
shell('yum install -y bzip2')
58-
end
59-
end
60-
on host, puppet('module', 'install', 'stahnma/epel')
61-
end
62-
end
63-
end
64-
6533
shared_examples 'a idempotent resource' do
6634
it 'applies with no errors' do
6735
execute_manifest(pp, catch_failures: true)

0 commit comments

Comments
 (0)