Skip to content

Commit

Permalink
Merge pull request puppetlabs#1199 from eimlav/fm-8029
Browse files Browse the repository at this point in the history
(FM-8029) Add RedHat 8 support
  • Loading branch information
tphoney authored May 30, 2019
2 parents c7da528 + 22f1c00 commit eb3f191
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 139 deletions.
3 changes: 2 additions & 1 deletion metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
"operatingsystemrelease": [
"5",
"6",
"7"
"7",
"8"
]
},
{
Expand Down
111 changes: 0 additions & 111 deletions spec/acceptance/locales_spec.rb

This file was deleted.

27 changes: 0 additions & 27 deletions spec/spec_helper_acceptance.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,33 +33,6 @@ def idempotent_apply(hosts, manifest, opts = {}, &block)
RSpec.configure do |c|
# Readable test descriptions
c.formatter = :documentation

# detect the situation where PUP-5016 is triggered and skip the idempotency tests in that case
# also note how fact('puppetversion') is not available because of PUP-4359
if os[:family] == 'debian' && os[:release].to_i == 8 && shell('puppet --version').stdout =~ %r{^4\.2}
c.filter_run_excluding skip_pup_5016: true
end

# Configure all nodes in nodeset
c.before :suite do
run_puppet_access_login(user: 'admin') if pe_install? && (Gem::Version.new(puppet_version) >= Gem::Version.new('5.0.0'))
hosts.each do |host|
# This will be removed, this is temporary to test localisation.

if os[:family] == 'debian'
# install language on debian systems
install_language_on(host, 'ja_JP.utf-8') if not_controller(host)
# This will be removed, this is temporary to test localisation.
end
# Required for binding tests.
if os[:family] == 'redhat'
if os[:release].to_i == 7 || os[:family] == 'fedora'
shell('yum install -y bzip2')
end
end
on host, puppet('module', 'install', 'stahnma/epel')
end
end
end

shared_examples 'a idempotent resource' do
Expand Down

0 comments on commit eb3f191

Please sign in to comment.