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

@@ -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'

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())

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())

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())

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())

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())

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())

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())

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())

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())

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())

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())

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())

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())

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())

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())

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())

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())

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())

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())

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())

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())

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())

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())

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())

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())

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())

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())

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())