From 1f80fff1eb9aadcbb45d4f0a822a5606a8c14512 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 6 Mar 2023 17:18:54 +0900 Subject: [PATCH] Fix test coverage for old OS/puppet versions This change fixes how old OS versions and puppet versions are tested and now we use only the combinations supported in the past, instead of testing the all combinations which contain some invalid ones like Puppet 5 + CentOS Stream 9. Depends-on: https://review.opendev.org/876554 Change-Id: Ie22c586c6f0e8cfe82a46bd62d3953af1918e777 --- .zuul.yaml | 24 ++++++++++++++----- spec/classes/ceph_conf_spec.rb | 4 +++- spec/classes/ceph_init_spec.rb | 4 +++- spec/classes/ceph_mds_spec.rb | 4 +++- spec/classes/ceph_mons_spec.rb | 4 +++- spec/classes/ceph_osds_spec.rb | 4 +++- spec/classes/ceph_profile_base_spec.rb | 4 +++- spec/classes/ceph_profile_client_spec.rb | 4 +++- spec/classes/ceph_profile_fs_spec.rb | 4 +++- spec/classes/ceph_profile_mds_spec.rb | 4 +++- spec/classes/ceph_profile_mgr_spec.rb | 4 +++- spec/classes/ceph_profile_mon_spec.rb | 4 +++- spec/classes/ceph_profile_osd_spec.rb | 4 +++- spec/classes/ceph_profile_params_spec.rb | 4 +++- spec/classes/ceph_repo_spec.rb | 4 +++- spec/classes/ceph_rgw_keystone_auth_spec.rb | 4 +++- spec/defines/ceph_fs_spec.rb | 4 +++- spec/defines/ceph_key_spec.rb | 4 +++- spec/defines/ceph_mgr_spec.rb | 4 +++- spec/defines/ceph_mon_spec.rb | 4 +++- spec/defines/ceph_osd_spec.rb | 4 +++- spec/defines/ceph_pool_spec.rb | 4 +++- spec/defines/ceph_rbd_mirror_spec.rb | 4 +++- .../ceph_rgw_apache_proxy_fcgi_spec.rb | 4 +++- spec/defines/ceph_rgw_barbican_spec.rb | 4 +++- spec/defines/ceph_rgw_beast_spec.rb | 4 +++- spec/defines/ceph_rgw_civetweb_spec.rb | 4 +++- spec/defines/ceph_rgw_keystone_spec.rb | 4 +++- spec/defines/ceph_rgw_spec.rb | 4 +++- 29 files changed, 102 insertions(+), 34 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index b17eb7d8..f839d4c5 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -7,17 +7,29 @@ - release-notes-jobs-python3 check: jobs: - - puppet-ceph-unit-5.5-centos-8-stream + - puppet-ceph-unit-5.5-centos-8-stream-train + - puppet-ceph-unit-6.21-ubuntu-focal-yoga gate: jobs: - - puppet-ceph-unit-5.5-centos-8-stream + - puppet-ceph-unit-5.5-centos-8-stream-train + - puppet-ceph-unit-6.21-ubuntu-focal-yoga + +# NOTE(tkajinam): stable/train supports CentOS 7, Ubuntu 18.04 and Puppet 5 - job: - name: puppet-ceph-unit-5.5-centos-8-stream + name: puppet-ceph-unit-5.5-centos-8-stream-train parent: puppet-openstack-unit-base nodeset: centos-8-stream - voting: false - # stable/ussuri is the last release with Puppet 5.x support - override-checkout: stable/ussuri + override-checkout: stable/train vars: puppet_gem_version: 5.5.0 + rspec_puppet_version: '~> 2.3.0' + +# NOTE(tkajinam): stable/yoga supports CentOS 8, Ubuntu 20.04 and Puppet 6 +- job: + name: puppet-ceph-unit-6.21-ubuntu-focal-yoga + parent: puppet-openstack-unit-base + nodeset: ubuntu-focal + override-checkout: stable/yoga + vars: + puppet_gem_version: 6.21.1 rspec_puppet_version: '= 2.9.0' diff --git a/spec/classes/ceph_conf_spec.rb b/spec/classes/ceph_conf_spec.rb index ebc5b387..c0c7d05c 100644 --- a/spec/classes/ceph_conf_spec.rb +++ b/spec/classes/ceph_conf_spec.rb @@ -41,7 +41,9 @@ describe 'ceph::conf' do end end - on_supported_os.each do |os,facts| + on_supported_os({ + :supported_os => OSDefaults.get_supported_os + }).each do |os,facts| context "on #{os}" do let (:facts) do facts.merge!(OSDefaults.get_facts()) diff --git a/spec/classes/ceph_init_spec.rb b/spec/classes/ceph_init_spec.rb index b77a42af..2a1378ee 100644 --- a/spec/classes/ceph_init_spec.rb +++ b/spec/classes/ceph_init_spec.rb @@ -145,7 +145,9 @@ describe 'ceph' do end end - on_supported_os.each do |os,facts| + on_supported_os({ + :supported_os => OSDefaults.get_supported_os + }).each do |os,facts| context "on #{os}" do let (:facts) do facts.merge!(OSDefaults.get_facts()) diff --git a/spec/classes/ceph_mds_spec.rb b/spec/classes/ceph_mds_spec.rb index b8e1f87e..42bba49f 100644 --- a/spec/classes/ceph_mds_spec.rb +++ b/spec/classes/ceph_mds_spec.rb @@ -65,7 +65,9 @@ describe 'ceph::mds' do end end - on_supported_os.each do |os,facts| + on_supported_os({ + :supported_os => OSDefaults.get_supported_os + }).each do |os,facts| context "on #{os}" do let (:facts) do facts.merge!(OSDefaults.get_facts()) diff --git a/spec/classes/ceph_mons_spec.rb b/spec/classes/ceph_mons_spec.rb index d7d199d5..a4064d36 100644 --- a/spec/classes/ceph_mons_spec.rb +++ b/spec/classes/ceph_mons_spec.rb @@ -46,7 +46,9 @@ describe 'ceph::mons' do } end - on_supported_os.each do |os,facts| + on_supported_os({ + :supported_os => OSDefaults.get_supported_os + }).each do |os,facts| context "on #{os}" do let (:facts) do facts.merge!(OSDefaults.get_facts()) diff --git a/spec/classes/ceph_osds_spec.rb b/spec/classes/ceph_osds_spec.rb index 1335d2c7..c056daf9 100644 --- a/spec/classes/ceph_osds_spec.rb +++ b/spec/classes/ceph_osds_spec.rb @@ -46,7 +46,9 @@ describe 'ceph::osds' do } end - on_supported_os.each do |os,facts| + on_supported_os({ + :supported_os => OSDefaults.get_supported_os + }).each do |os,facts| context "on #{os}" do let (:facts) do facts.merge!(OSDefaults.get_facts()) diff --git a/spec/classes/ceph_profile_base_spec.rb b/spec/classes/ceph_profile_base_spec.rb index 31e73c15..9bc1b61e 100644 --- a/spec/classes/ceph_profile_base_spec.rb +++ b/spec/classes/ceph_profile_base_spec.rb @@ -37,7 +37,9 @@ describe 'ceph::profile::base' do end - on_supported_os.each do |os, facts| + on_supported_os({ + :supported_os => OSDefaults.get_supported_os + }).each do |os,facts| context "on #{os}" do let (:facts) do facts.merge!(OSDefaults.get_facts()) diff --git a/spec/classes/ceph_profile_client_spec.rb b/spec/classes/ceph_profile_client_spec.rb index 25f6ac23..8a53a677 100644 --- a/spec/classes/ceph_profile_client_spec.rb +++ b/spec/classes/ceph_profile_client_spec.rb @@ -89,7 +89,9 @@ describe 'ceph::profile::client' do end end - on_supported_os.each do |os, facts| + on_supported_os({ + :supported_os => OSDefaults.get_supported_os + }).each do |os,facts| context "on #{os}" do let (:facts) do facts.merge!(OSDefaults.get_facts()) diff --git a/spec/classes/ceph_profile_fs_spec.rb b/spec/classes/ceph_profile_fs_spec.rb index 0ce32082..8c389d16 100644 --- a/spec/classes/ceph_profile_fs_spec.rb +++ b/spec/classes/ceph_profile_fs_spec.rb @@ -25,7 +25,9 @@ describe 'ceph::profile::fs' do )} end - on_supported_os.each do |os, facts| + on_supported_os({ + :supported_os => OSDefaults.get_supported_os + }).each do |os,facts| context "on #{os}" do let (:facts) do facts.merge!(OSDefaults.get_facts()) diff --git a/spec/classes/ceph_profile_mds_spec.rb b/spec/classes/ceph_profile_mds_spec.rb index 5c02f7b8..d15aed29 100644 --- a/spec/classes/ceph_profile_mds_spec.rb +++ b/spec/classes/ceph_profile_mds_spec.rb @@ -36,7 +36,9 @@ describe 'ceph::profile::mds' do )} end - on_supported_os.each do |os, facts| + on_supported_os({ + :supported_os => OSDefaults.get_supported_os + }).each do |os,facts| context "on #{os}" do let (:facts) do facts.merge!(OSDefaults.get_facts()) diff --git a/spec/classes/ceph_profile_mgr_spec.rb b/spec/classes/ceph_profile_mgr_spec.rb index 66191e62..182a017a 100644 --- a/spec/classes/ceph_profile_mgr_spec.rb +++ b/spec/classes/ceph_profile_mgr_spec.rb @@ -27,7 +27,9 @@ describe 'ceph::profile::mgr' do } end - on_supported_os.each do |os, facts| + on_supported_os({ + :supported_os => OSDefaults.get_supported_os + }).each do |os,facts| context "on #{os}" do let (:facts) do facts.merge!(OSDefaults.get_facts()) diff --git a/spec/classes/ceph_profile_mon_spec.rb b/spec/classes/ceph_profile_mon_spec.rb index 07215d46..8b832314 100644 --- a/spec/classes/ceph_profile_mon_spec.rb +++ b/spec/classes/ceph_profile_mon_spec.rb @@ -62,7 +62,9 @@ describe 'ceph::profile::mon' do )} end - on_supported_os.each do |os, facts| + on_supported_os({ + :supported_os => OSDefaults.get_supported_os + }).each do |os,facts| context "on #{os}" do let (:facts) do facts.merge!(OSDefaults.get_facts()) diff --git a/spec/classes/ceph_profile_osd_spec.rb b/spec/classes/ceph_profile_osd_spec.rb index d0eb8ef9..f239668f 100644 --- a/spec/classes/ceph_profile_osd_spec.rb +++ b/spec/classes/ceph_profile_osd_spec.rb @@ -42,7 +42,9 @@ describe 'ceph::profile::osd' do end end - on_supported_os.each do |os, facts| + on_supported_os({ + :supported_os => OSDefaults.get_supported_os + }).each do |os,facts| context "on #{os}" do let (:facts) do facts.merge!(OSDefaults.get_facts()) diff --git a/spec/classes/ceph_profile_params_spec.rb b/spec/classes/ceph_profile_params_spec.rb index 84843f8a..b7bafca3 100644 --- a/spec/classes/ceph_profile_params_spec.rb +++ b/spec/classes/ceph_profile_params_spec.rb @@ -46,7 +46,9 @@ describe 'ceph::profile::params' do end end - on_supported_os.each do |os, facts| + on_supported_os({ + :supported_os => OSDefaults.get_supported_os + }).each do |os,facts| context "on #{os}" do let (:facts) do facts.merge!(OSDefaults.get_facts()) diff --git a/spec/classes/ceph_repo_spec.rb b/spec/classes/ceph_repo_spec.rb index 976ad63d..f5aa01b8 100644 --- a/spec/classes/ceph_repo_spec.rb +++ b/spec/classes/ceph_repo_spec.rb @@ -603,7 +603,9 @@ describe 'ceph::repo' do end end - on_supported_os.each do |os, facts| + on_supported_os({ + :supported_os => OSDefaults.get_supported_os + }).each do |os,facts| context "on #{os}" do let (:facts) do facts.merge!(OSDefaults.get_facts()) diff --git a/spec/classes/ceph_rgw_keystone_auth_spec.rb b/spec/classes/ceph_rgw_keystone_auth_spec.rb index 40960a61..2d0ca7bd 100644 --- a/spec/classes/ceph_rgw_keystone_auth_spec.rb +++ b/spec/classes/ceph_rgw_keystone_auth_spec.rb @@ -41,7 +41,9 @@ describe 'ceph::rgw::keystone::auth' do } end - on_supported_os.each do |os,facts| + on_supported_os({ + :supported_os => OSDefaults.get_supported_os + }).each do |os,facts| context "on #{os}" do let (:facts) do facts.merge!(OSDefaults.get_facts()) diff --git a/spec/defines/ceph_fs_spec.rb b/spec/defines/ceph_fs_spec.rb index 7436faa3..759d619e 100644 --- a/spec/defines/ceph_fs_spec.rb +++ b/spec/defines/ceph_fs_spec.rb @@ -36,7 +36,9 @@ describe 'ceph::fs' do end end - on_supported_os.each do |os,facts| + on_supported_os({ + :supported_os => OSDefaults.get_supported_os + }).each do |os,facts| context "on #{os}" do let (:facts) do facts.merge!(OSDefaults.get_facts()) diff --git a/spec/defines/ceph_key_spec.rb b/spec/defines/ceph_key_spec.rb index a2db7262..9b7241aa 100644 --- a/spec/defines/ceph_key_spec.rb +++ b/spec/defines/ceph_key_spec.rb @@ -58,7 +58,9 @@ describe 'ceph::key' do end end - on_supported_os.each do |os,facts| + on_supported_os({ + :supported_os => OSDefaults.get_supported_os + }).each do |os,facts| context "on #{os}" do let (:facts) do facts.merge!(OSDefaults.get_facts()) diff --git a/spec/defines/ceph_mgr_spec.rb b/spec/defines/ceph_mgr_spec.rb index 9974e564..1c6a26f3 100644 --- a/spec/defines/ceph_mgr_spec.rb +++ b/spec/defines/ceph_mgr_spec.rb @@ -69,7 +69,9 @@ describe 'ceph::mgr' do end end - on_supported_os.each do |os,facts| + on_supported_os({ + :supported_os => OSDefaults.get_supported_os + }).each do |os,facts| context "on #{os}" do let (:facts) do facts.merge!(OSDefaults.get_facts()) diff --git a/spec/defines/ceph_mon_spec.rb b/spec/defines/ceph_mon_spec.rb index 4b10c9e4..f316ceb0 100644 --- a/spec/defines/ceph_mon_spec.rb +++ b/spec/defines/ceph_mon_spec.rb @@ -263,7 +263,9 @@ test ! -d \$mon_data end end - on_supported_os.each do |os,facts| + on_supported_os({ + :supported_os => OSDefaults.get_supported_os + }).each do |os,facts| context "on #{os}" do let (:facts) do facts.merge!(OSDefaults.get_facts()) diff --git a/spec/defines/ceph_osd_spec.rb b/spec/defines/ceph_osd_spec.rb index f32c4be2..16544e8e 100644 --- a/spec/defines/ceph_osd_spec.rb +++ b/spec/defines/ceph_osd_spec.rb @@ -515,7 +515,9 @@ fi end end - on_supported_os.each do |os,facts| + on_supported_os({ + :supported_os => OSDefaults.get_supported_os + }).each do |os,facts| context "on #{os}" do let (:facts) do facts.merge!(OSDefaults.get_facts()) diff --git a/spec/defines/ceph_pool_spec.rb b/spec/defines/ceph_pool_spec.rb index 4593a696..7c9f688c 100644 --- a/spec/defines/ceph_pool_spec.rb +++ b/spec/defines/ceph_pool_spec.rb @@ -75,7 +75,9 @@ describe 'ceph::pool' do end end - on_supported_os.each do |os,facts| + on_supported_os({ + :supported_os => OSDefaults.get_supported_os + }).each do |os,facts| context "on #{os}" do let (:facts) do facts.merge!(OSDefaults.get_facts()) diff --git a/spec/defines/ceph_rbd_mirror_spec.rb b/spec/defines/ceph_rbd_mirror_spec.rb index 786a2fb8..0827cf3a 100644 --- a/spec/defines/ceph_rbd_mirror_spec.rb +++ b/spec/defines/ceph_rbd_mirror_spec.rb @@ -27,7 +27,9 @@ describe 'ceph::mirror' do end end - on_supported_os.each do |os,facts| + on_supported_os({ + :supported_os => OSDefaults.get_supported_os + }).each do |os,facts| context "on #{os}" do let (:facts) do facts.merge!(OSDefaults.get_facts()) diff --git a/spec/defines/ceph_rgw_apache_proxy_fcgi_spec.rb b/spec/defines/ceph_rgw_apache_proxy_fcgi_spec.rb index fdb591e7..c3f3a144 100644 --- a/spec/defines/ceph_rgw_apache_proxy_fcgi_spec.rb +++ b/spec/defines/ceph_rgw_apache_proxy_fcgi_spec.rb @@ -101,7 +101,9 @@ describe 'ceph::rgw::apache_proxy_fcgi' do end end - on_supported_os.each do |os, facts| + on_supported_os({ + :supported_os => OSDefaults.get_supported_os + }).each do |os,facts| context "on #{os}" do let (:facts) do facts.merge!(OSDefaults.get_facts()) diff --git a/spec/defines/ceph_rgw_barbican_spec.rb b/spec/defines/ceph_rgw_barbican_spec.rb index f852f0f1..ed1e4bd2 100644 --- a/spec/defines/ceph_rgw_barbican_spec.rb +++ b/spec/defines/ceph_rgw_barbican_spec.rb @@ -79,7 +79,9 @@ describe 'ceph::rgw::barbican' do end end - on_supported_os.each do |os, facts| + on_supported_os({ + :supported_os => OSDefaults.get_supported_os + }).each do |os,facts| context "on #{os}" do let (:facts) do facts.merge!(OSDefaults.get_facts()) diff --git a/spec/defines/ceph_rgw_beast_spec.rb b/spec/defines/ceph_rgw_beast_spec.rb index 6229117e..04ba03f1 100644 --- a/spec/defines/ceph_rgw_beast_spec.rb +++ b/spec/defines/ceph_rgw_beast_spec.rb @@ -67,7 +67,9 @@ describe 'ceph::rgw' do end end - on_supported_os.each do |os, facts| + on_supported_os({ + :supported_os => OSDefaults.get_supported_os + }).each do |os,facts| context "on #{os}" do let (:facts) do facts.merge!(OSDefaults.get_facts()) diff --git a/spec/defines/ceph_rgw_civetweb_spec.rb b/spec/defines/ceph_rgw_civetweb_spec.rb index 01261e6e..7a188812 100644 --- a/spec/defines/ceph_rgw_civetweb_spec.rb +++ b/spec/defines/ceph_rgw_civetweb_spec.rb @@ -68,7 +68,9 @@ describe 'ceph::rgw' do end end - on_supported_os.each do |os,facts| + on_supported_os({ + :supported_os => OSDefaults.get_supported_os + }).each do |os,facts| context "on #{os}" do let (:facts) do facts.merge!(OSDefaults.get_facts()) diff --git a/spec/defines/ceph_rgw_keystone_spec.rb b/spec/defines/ceph_rgw_keystone_spec.rb index f2ee1fae..210532ca 100644 --- a/spec/defines/ceph_rgw_keystone_spec.rb +++ b/spec/defines/ceph_rgw_keystone_spec.rb @@ -93,7 +93,9 @@ describe 'ceph::rgw::keystone' do end end - on_supported_os.each do |os, facts| + on_supported_os({ + :supported_os => OSDefaults.get_supported_os + }).each do |os,facts| context "on #{os}" do let (:facts) do facts.merge!(OSDefaults.get_facts()) diff --git a/spec/defines/ceph_rgw_spec.rb b/spec/defines/ceph_rgw_spec.rb index 18c3c686..d25597c9 100644 --- a/spec/defines/ceph_rgw_spec.rb +++ b/spec/defines/ceph_rgw_spec.rb @@ -108,7 +108,9 @@ describe 'ceph::rgw' do end end - on_supported_os.each do |os, facts| + on_supported_os({ + :supported_os => OSDefaults.get_supported_os + }).each do |os,facts| context "on #{os}" do let (:facts) do facts.merge!(OSDefaults.get_facts())