openstack/puppet-tempest
Code Issues Proposed changes

Use consistent resource name for plugin packages

Browse Source 
... because this module installs only tempest plugins now.

Change-Id: I2a0d510d733919c88624fe75f1f3c6ceef83ee0c
This commit is contained in:
Takashi Kajinami 2023-10-26 14:48:20 +09:00
parent 685072bbbb
commit 94b24e02d7
2 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
manifests/init.pp
View File

@ -746,56 +746,56 @@ class tempest(
if $manage_tests_packages { if $manage_tests_packages {
if ($aodh_available or $ceilometer_available or $gnocchi_available) and $::tempest::params::python_telemetry_tests { if ($aodh_available or $ceilometer_available or $gnocchi_available) and $::tempest::params::python_telemetry_tests {
package { 'python-telemetry-tests': package { 'python-telemetry-tests-tempest':
ensure => present, ensure => present,
name => $::tempest::params::python_telemetry_tests, name => $::tempest::params::python_telemetry_tests,
tag => ['openstack', 'tempest-package'], tag => ['openstack', 'tempest-package'],
} }
} }
if $cinder_available and $::tempest::params::python_cinder_tests { if $cinder_available and $::tempest::params::python_cinder_tests {
package { 'python-cinder-tests': package { 'python-cinder-tests-tempest':
ensure => present, ensure => present,
name => $::tempest::params::python_cinder_tests, name => $::tempest::params::python_cinder_tests,
tag => ['openstack', 'tempest-package'], tag => ['openstack', 'tempest-package'],
} }
} }
if $glance_available and $::tempest::params::python_glance_tests { if $glance_available and $::tempest::params::python_glance_tests {
package { 'python-glance-tests': package { 'python-glance-tests-tempest':
ensure => present, ensure => present,
name => $::tempest::params::python_glance_tests, name => $::tempest::params::python_glance_tests,
tag => ['openstack', 'tempest-package'], tag => ['openstack', 'tempest-package'],
} }
} }
if $heat_available and $::tempest::params::python_heat_tests { if $heat_available and $::tempest::params::python_heat_tests {
package { 'python-heat-tests': package { 'python-heat-tests-tempest':
ensure => present, ensure => present,
name => $::tempest::params::python_heat_tests, name => $::tempest::params::python_heat_tests,
tag => ['openstack', 'tempest-package'], tag => ['openstack', 'tempest-package'],
} }
} }
if ($ironic_available or $ironic_inspector_available) and $::tempest::params::python_ironic_tests { if ($ironic_available or $ironic_inspector_available) and $::tempest::params::python_ironic_tests {
package { 'python-ironic-tests': package { 'python-ironic-tests-tempest':
ensure => present, ensure => present,
name => $::tempest::params::python_ironic_tests, name => $::tempest::params::python_ironic_tests,
tag => ['openstack', 'tempest-package'], tag => ['openstack', 'tempest-package'],
} }
} }
if $::tempest::params::python_keystone_tests { if $::tempest::params::python_keystone_tests {
package { 'python-keystone-tests': package { 'python-keystone-tests-tempest':
ensure => present, ensure => present,
name => $::tempest::params::python_keystone_tests, name => $::tempest::params::python_keystone_tests,
tag => ['openstack', 'tempest-package'], tag => ['openstack', 'tempest-package'],
} }
} }
if $murano_available and $::tempest::params::python_murano_tests { if $murano_available and $::tempest::params::python_murano_tests {
package { 'python-murano-tests': package { 'python-murano-tests-tempest':
ensure => present, ensure => present,
name => $::tempest::params::python_murano_tests, name => $::tempest::params::python_murano_tests,
tag => ['openstack', 'tempest-package'], tag => ['openstack', 'tempest-package'],
} }
} }
if $neutron_available and $::tempest::params::python_neutron_tests { if $neutron_available and $::tempest::params::python_neutron_tests {
package { 'python-neutron-tests': package { 'python-neutron-tests-tempest':
ensure => present, ensure => present,
name => $::tempest::params::python_neutron_tests, name => $::tempest::params::python_neutron_tests,
tag => ['openstack', 'tempest-package'], tag => ['openstack', 'tempest-package'],
@ -816,7 +816,7 @@ class tempest(
} }
} }
if $trove_available and $::tempest::params::python_trove_tests { if $trove_available and $::tempest::params::python_trove_tests {
package { 'python-trove-tests': package { 'python-trove-tests-tempest':
ensure => present, ensure => present,
name => $::tempest::params::python_trove_tests, name => $::tempest::params::python_trove_tests,
tag => ['openstack', 'tempest-package'], tag => ['openstack', 'tempest-package'],
@ -830,42 +830,42 @@ class tempest(
} }
} }
if $zaqar_available and $::tempest::params::python_zaqar_tests { if $zaqar_available and $::tempest::params::python_zaqar_tests {
package { 'python-zaqar-tests': package { 'python-zaqar-tests-tempest':
ensure => present, ensure => present,
name => $::tempest::params::python_zaqar_tests, name => $::tempest::params::python_zaqar_tests,
tag => ['openstack', 'tempest-package'], tag => ['openstack', 'tempest-package'],
} }
} }
if $mistral_available and $::tempest::params::python_mistral_tests { if $mistral_available and $::tempest::params::python_mistral_tests {
package { 'python-mistral-tests': package { 'python-mistral-tests-tempest':
ensure => present, ensure => present,
name => $::tempest::params::python_mistral_tests, name => $::tempest::params::python_mistral_tests,
tag => ['openstack', 'tempest-package'], tag => ['openstack', 'tempest-package'],
} }
} }
if $vitrage_available and $::tempest::params::python_vitrage_tests { if $vitrage_available and $::tempest::params::python_vitrage_tests {
package { 'python-vitrage-tests': package { 'python-vitrage-tests-tempest':
ensure => present, ensure => present,
name => $::tempest::params::python_vitrage_tests, name => $::tempest::params::python_vitrage_tests,
tag => ['openstack', 'tempest-package'], tag => ['openstack', 'tempest-package'],
} }
} }
if $designate_available and $::tempest::params::python_designate_tests { if $designate_available and $::tempest::params::python_designate_tests {
package { 'python-designate-tests': package { 'python-designate-tests-tempest':
ensure => present, ensure => present,
name => $::tempest::params::python_designate_tests, name => $::tempest::params::python_designate_tests,
tag => ['openstack', 'tempest-package'], tag => ['openstack', 'tempest-package'],
} }
} }
if $octavia_available and $::tempest::params::python_octavia_tests { if $octavia_available and $::tempest::params::python_octavia_tests {
package { 'python-octavia-tests': package { 'python-octavia-tests-tempest':
ensure => present, ensure => present,
name => $::tempest::params::python_octavia_tests, name => $::tempest::params::python_octavia_tests,
tag => ['openstack', 'tempest-package'], tag => ['openstack', 'tempest-package'],
} }
} }
if $ec2api_available and $::tempest::params::python_ec2api_tests { if $ec2api_available and $::tempest::params::python_ec2api_tests {
package { 'python-ec2-api-tests': package { 'python-ec2-api-tests-tempest':
ensure => present, ensure => present,
name => $::tempest::params::python_ec2api_tests, name => $::tempest::params::python_ec2api_tests,
tag => ['openstack', 'tempest-package'], tag => ['openstack', 'tempest-package'],

6
spec/classes/tempest_init_spec.rb
View File

@ -541,7 +541,7 @@ describe 'tempest' do
context 'with when managing tests packages for keystone (required service)' do context 'with when managing tests packages for keystone (required service)' do
it "should install keystone tests package" do it "should install keystone tests package" do
is_expected.to contain_package('python-keystone-tests') is_expected.to contain_package('python-keystone-tests-tempest')
is_expected.to_not contain_package('python-sahara-tests-tempest') is_expected.to_not contain_package('python-sahara-tests-tempest')
end end
end end
@ -568,10 +568,8 @@ describe 'tempest' do
it "should install neutron and *aas tests packages" do it "should install neutron and *aas tests packages" do
if platform_params[:python_neutron_tests] if platform_params[:python_neutron_tests]
is_expected.to contain_package('python-neutron-tests') is_expected.to contain_package('python-neutron-tests-tempest')
end end
is_expected.to_not contain_package('python-neutron-vpnaas-tests')
is_expected.to_not contain_package('python-neutron-dynamic-routing-tests')
is_expected.to_not contain_package('python-networking-l2gw-tests-tempest') is_expected.to_not contain_package('python-networking-l2gw-tests-tempest')
end end
end end