From b8230c0616937f4fdcb8ad7decfecb2be1d1ed3e Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sun, 24 Jul 2022 00:57:11 +0900 Subject: [PATCH] Revert "CentOS 9: Disable unit tests dependent on puppet-postgresql" This reverts commit 8b78315331b4db67a6f788afd29bce12fe332db8. 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: Icb2b0e3772d3d5ba4893060ac36453d8ac2e5d63 --- spec/classes/sahara_db_postgresql_spec.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/spec/classes/sahara_db_postgresql_spec.rb b/spec/classes/sahara_db_postgresql_spec.rb index a7b6d407..25ebc883 100644 --- a/spec/classes/sahara_db_postgresql_spec.rb +++ b/spec/classes/sahara_db_postgresql_spec.rb @@ -35,14 +35,13 @@ describe 'sahara::db::postgresql' do context "on #{os}" do let (:facts) do facts.merge(OSDefaults.get_facts({ - :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 'sahara::db::postgresql' - end + it_configures 'sahara::db::postgresql' end end