CentOS 8 support
- ChefSpec updates Depends-On: https://review.opendev.org/c/openstack/cookbook-openstack-identity/+/815147 Change-Id: I494763e2d873fc80d01135fb0ec99ab4e2e51635 Signed-off-by: Lance Albertson <lance@osuosl.org>
This commit is contained in:
parent
d911425d0a
commit
e7e76f07a2
|
@ -1,25 +1,34 @@
|
|||
require_relative 'spec_helper'
|
||||
|
||||
describe 'openstack-image::api' do
|
||||
describe 'redhat' do
|
||||
let(:runner) { ChefSpec::SoloRunner.new(REDHAT_OPTS) }
|
||||
let(:node) { runner.node }
|
||||
cached(:chef_run) do
|
||||
runner.converge(described_recipe)
|
||||
end
|
||||
ALL_RHEL.each do |p|
|
||||
context "redhat #{p[:version]}" do
|
||||
let(:runner) { ChefSpec::SoloRunner.new(p) }
|
||||
let(:node) { runner.node }
|
||||
cached(:chef_run) do
|
||||
runner.converge(described_recipe)
|
||||
end
|
||||
|
||||
include_context 'image-stubs'
|
||||
include_context 'image-stubs'
|
||||
|
||||
it 'does not upgrade keystoneclient package' do
|
||||
expect(chef_run).not_to upgrade_package('python-keystoneclient')
|
||||
end
|
||||
case p
|
||||
when REDHAT_7
|
||||
it 'does not upgrade keystoneclient package' do
|
||||
expect(chef_run).not_to upgrade_package('python-keystoneclient')
|
||||
end
|
||||
when REDHAT_8
|
||||
it 'does not upgrade keystoneclient package' do
|
||||
expect(chef_run).not_to upgrade_package('python3-keystoneclient')
|
||||
end
|
||||
end
|
||||
|
||||
it 'does not upgrade swift packages by default' do
|
||||
expect(chef_run).not_to upgrade_package('openstack-swift')
|
||||
end
|
||||
it 'does not upgrade swift packages by default' do
|
||||
expect(chef_run).not_to upgrade_package('openstack-swift')
|
||||
end
|
||||
|
||||
it do
|
||||
expect(chef_run).to enable_service('openstack-glance-api')
|
||||
it do
|
||||
expect(chef_run).to enable_service('openstack-glance-api')
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -8,10 +8,21 @@ RSpec.configure do |config|
|
|||
config.log_level = :warn
|
||||
end
|
||||
|
||||
REDHAT_OPTS = {
|
||||
REDHAT_7 = {
|
||||
platform: 'redhat',
|
||||
version: '7',
|
||||
}.freeze
|
||||
|
||||
REDHAT_8 = {
|
||||
platform: 'redhat',
|
||||
version: '8',
|
||||
}.freeze
|
||||
|
||||
ALL_RHEL = [
|
||||
REDHAT_7,
|
||||
REDHAT_8,
|
||||
].freeze
|
||||
|
||||
UBUNTU_OPTS = {
|
||||
platform: 'ubuntu',
|
||||
version: '18.04',
|
||||
|
|
|
@ -1,15 +1,17 @@
|
|||
require_relative 'spec_helper'
|
||||
|
||||
describe 'openstack-image::swift_store' do
|
||||
describe 'ubuntu' do
|
||||
let(:runner) { ChefSpec::SoloRunner.new(REDHAT_OPTS) }
|
||||
let(:node) { runner.node }
|
||||
cached(:chef_run) do
|
||||
runner.converge(described_recipe)
|
||||
end
|
||||
include_context 'image-stubs'
|
||||
it do
|
||||
expect(chef_run).to upgrade_package('openstack-swift')
|
||||
ALL_RHEL.each do |p|
|
||||
context "redhat #{p[:version]}" do
|
||||
let(:runner) { ChefSpec::SoloRunner.new(p) }
|
||||
let(:node) { runner.node }
|
||||
cached(:chef_run) do
|
||||
runner.converge(described_recipe)
|
||||
end
|
||||
include_context 'image-stubs'
|
||||
it do
|
||||
expect(chef_run).to upgrade_package('openstack-swift')
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue