Revert "CentOS 9: Disable unit tests dependent on puppet-postgresql"

This reverts commit f016d7261c.

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: Iae81321d06d05ccb7f85fe982a017580480146e6
This commit is contained in:
Takashi Kajinami 2022-07-24 00:32:24 +09:00
parent 160e89609b
commit 6c4faf84a6
2 changed files with 10 additions and 11 deletions

View File

@ -35,15 +35,13 @@ describe 'gnocchi::db::postgresql' do
context "on #{os}" do
let (:facts) do
facts.merge(OSDefaults.get_facts({
:os_workers => 8,
:concat_basedir => '/var/lib/puppet/concat'
# puppet-postgresql requires the service_provider fact provided by
# puppetlabs-postgresql.
:service_provider => 'systemd'
}))
end
# TODO(tkajinam): Remove this once puppet-postgresql supports CentOS 9
unless facts[:osfamily] == 'RedHat' and facts[:operatingsystemmajrelease].to_i >= 9
it_configures 'gnocchi::db::postgresql'
end
it_configures 'gnocchi::db::postgresql'
end
end

View File

@ -103,7 +103,11 @@ describe 'gnocchi::db' do
}).each do |os,facts|
context "on #{os}" 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
let(:platform_params) do
@ -115,10 +119,7 @@ describe 'gnocchi::db' do
end
end
# TODO(tkajinam): Remove this once puppet-postgresql supports CentOS 9
unless facts[:osfamily] == 'RedHat' and facts[:operatingsystemmajrelease].to_i >= 9
it_behaves_like 'gnocchi::db'
end
it_behaves_like 'gnocchi::db'
it_behaves_like "gnocchi::db on #{facts[:osfamily]}"
end
end