From 20fec0749121b93189fd8a4195e21914982a3d30 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 16 Feb 2022 00:14:14 +0900 Subject: [PATCH] CentOS 9: Disable unit tests dependent on puppet-postgresql The puppt-postgresql module does not support CentOS 9 yet and requires some version parameters to be run on CentOS 9. This change disables unit tests requiring that module, until the module supports CentOS 9. Change-Id: Idd96ef1789268841cefa5e773b490e0470d7b9a0 --- spec/classes/nova_db_postgresql_api_spec.rb | 5 ++++- spec/classes/nova_db_postgresql_spec.rb | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/spec/classes/nova_db_postgresql_api_spec.rb b/spec/classes/nova_db_postgresql_api_spec.rb index 890656aa5..a2847b0f2 100644 --- a/spec/classes/nova_db_postgresql_api_spec.rb +++ b/spec/classes/nova_db_postgresql_api_spec.rb @@ -37,7 +37,10 @@ describe 'nova::db::postgresql_api' do })) end - it_configures 'nova::db::postgresql' + # TODO(tkajinam): Remove this once puppet-postgresql supports CentOS 9 + unless facts[:osfamily] == 'RedHat' and facts[:operatingsystemmajrelease].to_i >= 9 + it_configures 'nova::db::postgresql' + end end end diff --git a/spec/classes/nova_db_postgresql_spec.rb b/spec/classes/nova_db_postgresql_spec.rb index ac4d20ae2..98e2d0639 100644 --- a/spec/classes/nova_db_postgresql_spec.rb +++ b/spec/classes/nova_db_postgresql_spec.rb @@ -55,7 +55,10 @@ describe 'nova::db::postgresql' do })) end - it_configures 'nova::db::postgresql' + # TODO(tkajinam): Remove this once puppet-postgresql supports CentOS 9 + unless facts[:osfamily] == 'RedHat' and facts[:operatingsystemmajrelease].to_i >= 9 + it_configures 'nova::db::postgresql' + end end end