Revert "CentOS 9: Disable unit tests dependent on puppet-postgresql"
This reverts commit f4a4d65822f08dd8977a50cd3e50178ec0960c91. Reason for revert: puppet-postgresql 8.1.0 was released and now the module supports RHEL 9 (and CentOS 9 effectively). Note: This change adds the service_provider fact in test fact data because it is required by puppet-postgresql. Depends-on: https://review.opendev.org/850705 Change-Id: I30e0b9cd798fff3fff3b81d7355c3dda239e033d
This commit is contained in:
parent
dccea77ddd
commit
e8d678c465
@ -32,15 +32,13 @@ describe 'ironic::db::postgresql' do
|
|||||||
context "on #{os}" do
|
context "on #{os}" do
|
||||||
let (:facts) do
|
let (:facts) do
|
||||||
facts.merge(OSDefaults.get_facts({
|
facts.merge(OSDefaults.get_facts({
|
||||||
:os_workers => 8,
|
# puppet-postgresql requires the service_provider fact provided by
|
||||||
:concat_basedir => '/var/lib/puppet/concat'
|
# puppetlabs-postgresql.
|
||||||
|
:service_provider => 'systemd'
|
||||||
}))
|
}))
|
||||||
end
|
end
|
||||||
|
|
||||||
# TODO(tkajinam): Remove this once puppet-postgresql supports CentOS 9
|
it_behaves_like 'ironic::db::postgresql'
|
||||||
unless facts[:osfamily] == 'RedHat' and facts[:operatingsystemmajrelease].to_i >= 9
|
|
||||||
it_behaves_like 'ironic::db::postgresql'
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -31,13 +31,14 @@ describe 'ironic::inspector::db::postgresql' do
|
|||||||
}).each do |os,facts|
|
}).each do |os,facts|
|
||||||
context "on #{os}" do
|
context "on #{os}" do
|
||||||
let (:facts) do
|
let (:facts) do
|
||||||
facts.merge(OSDefaults.get_facts())
|
facts.merge(OSDefaults.get_facts({
|
||||||
|
# puppet-postgresql requires the service_provider fact provided by
|
||||||
|
# puppetlabs-postgresql.
|
||||||
|
:service_provider => 'systemd'
|
||||||
|
}))
|
||||||
end
|
end
|
||||||
|
|
||||||
# TODO(tkajinam): Remove this once puppet-postgresql supports CentOS 9
|
it_behaves_like 'ironic::inspector::db::postgresql'
|
||||||
unless facts[:osfamily] == 'RedHat' and facts[:operatingsystemmajrelease].to_i >= 9
|
|
||||||
it_behaves_like 'ironic::inspector::db::postgresql'
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user