Skip to content

Commit 2c0d17e

Browse files
committed
(maint) Support acceptance tests on el8
1 parent 9bd85ce commit 2c0d17e

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

spec/spec_helper_acceptance.rb

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,19 @@ def build_url(platform)
6464
on host, 'echo \'export PATH=/var/lib/gems/1.8/bin/:${PATH}\' >> ~/.bashrc'
6565
end
6666
# install_puppet
67-
if host['platform'] =~ %r{el-(5|6|7)}
67+
if host['platform'] =~ %r{el-(5|6|7|8)}
6868
relver = Regexp.last_match(1)
6969
on host, "rpm -ivh #{build_url('el')}#{relver}.noarch.rpm"
7070
on host, 'yum install -y puppetserver'
7171
on host, '/opt/puppetlabs/bin/puppetserver ca setup'
72+
73+
# TODO: we should probably be using the relatively new postgresql
74+
# module settings manage_dnf_module on el8 when we are managing the postgresql
75+
# database
76+
if relver == "8"
77+
on host, "dnf install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm"
78+
on host, "dnf -qy module disable postgresql"
79+
end
7280
elsif host['platform'] =~ %r{fedora-(\d+)}
7381
relver = Regexp.last_match(1)
7482
on host, "rpm -ivh #{build_url('fedora')}#{relver}.noarch.rpm"

0 commit comments

Comments
 (0)