Revert "CentOS 9: Disable unit tests dependent on puppet-postgresql"
This reverts commit f016d7261cfdc115acdcb86352b277dc01295dd7.
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
Takashi Kajinami
1 year, 9 months ago
| 34 | 34 |
context "on #{os}" do
|
| 35 | 35 |
let (:facts) do
|
| 36 | 36 |
facts.merge(OSDefaults.get_facts({
|
| 37 | |
:os_workers => 8,
|
| 38 | |
:concat_basedir => '/var/lib/puppet/concat'
|
|
37 |
# puppet-postgresql requires the service_provider fact provided by
|
|
38 |
# puppetlabs-postgresql.
|
|
39 |
:service_provider => 'systemd'
|
| 39 | 40 |
}))
|
| 40 | 41 |
end
|
| 41 | 42 |
|
| 42 | |
# TODO(tkajinam): Remove this once puppet-postgresql supports CentOS 9
|
| 43 | |
unless facts[:osfamily] == 'RedHat' and facts[:operatingsystemmajrelease].to_i >= 9
|
| 44 | |
it_configures 'gnocchi::db::postgresql'
|
| 45 | |
end
|
|
43 |
it_configures 'gnocchi::db::postgresql'
|
| 46 | 44 |
end
|
| 47 | 45 |
end
|
| 48 | 46 |
|
| 102 | 102 |
}).each do |os,facts|
|
| 103 | 103 |
context "on #{os}" do
|
| 104 | 104 |
let (:facts) do
|
| 105 | |
facts.merge!(OSDefaults.get_facts())
|
|
105 |
facts.merge!(OSDefaults.get_facts({
|
|
106 |
# puppet-postgresql requires the service_provider fact provided by
|
|
107 |
# puppetlabs-postgresql.
|
|
108 |
:service_provider => 'systemd'
|
|
109 |
}))
|
| 106 | 110 |
end
|
| 107 | 111 |
|
| 108 | 112 |
let(:platform_params) do
|
|
| 114 | 118 |
end
|
| 115 | 119 |
end
|
| 116 | 120 |
|
| 117 | |
# TODO(tkajinam): Remove this once puppet-postgresql supports CentOS 9
|
| 118 | |
unless facts[:osfamily] == 'RedHat' and facts[:operatingsystemmajrelease].to_i >= 9
|
| 119 | |
it_behaves_like 'gnocchi::db'
|
| 120 | |
end
|
|
121 |
it_behaves_like 'gnocchi::db'
|
| 121 | 122 |
it_behaves_like "gnocchi::db on #{facts[:osfamily]}"
|
| 122 | 123 |
end
|
| 123 | 124 |
end
|