CentOS 8 support
- ChefSpec updates Depends-On: https://review.opendev.org/c/openstack/cookbook-openstack-identity/+/815147 Depends-On: https://review.opendev.org/c/openstack/cookbook-openstack-compute/+/815173 Change-Id: I17fc8fafd977c8412f8e9519642ccbcd427c2949 Signed-off-by: Lance Albertson <lance@osuosl.org>
This commit is contained in:
parent
2f13299f3e
commit
8343638fc1
|
@ -1,8 +1,9 @@
|
||||||
require_relative 'spec_helper'
|
require_relative 'spec_helper'
|
||||||
|
|
||||||
describe 'openstack-orchestration::api-cfn' do
|
describe 'openstack-orchestration::api-cfn' do
|
||||||
describe 'redhat' do
|
ALL_RHEL.each do |p|
|
||||||
let(:runner) { ChefSpec::SoloRunner.new(REDHAT_OPTS) }
|
context "redhat #{p[:version]}" do
|
||||||
|
let(:runner) { ChefSpec::SoloRunner.new(p) }
|
||||||
let(:node) { runner.node }
|
let(:node) { runner.node }
|
||||||
cached(:chef_run) { runner.converge(described_recipe) }
|
cached(:chef_run) { runner.converge(described_recipe) }
|
||||||
|
|
||||||
|
@ -22,3 +23,4 @@ describe 'openstack-orchestration::api-cfn' do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
|
@ -1,8 +1,9 @@
|
||||||
require_relative 'spec_helper'
|
require_relative 'spec_helper'
|
||||||
|
|
||||||
describe 'openstack-orchestration::api' do
|
describe 'openstack-orchestration::api' do
|
||||||
describe 'redhat' do
|
ALL_RHEL.each do |p|
|
||||||
let(:runner) { ChefSpec::SoloRunner.new(REDHAT_OPTS) }
|
context "redhat #{p[:version]}" do
|
||||||
|
let(:runner) { ChefSpec::SoloRunner.new(p) }
|
||||||
let(:node) { runner.node }
|
let(:node) { runner.node }
|
||||||
cached(:chef_run) { runner.converge(described_recipe) }
|
cached(:chef_run) { runner.converge(described_recipe) }
|
||||||
|
|
||||||
|
@ -22,3 +23,4 @@ describe 'openstack-orchestration::api' do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
|
@ -1,8 +1,9 @@
|
||||||
require_relative 'spec_helper'
|
require_relative 'spec_helper'
|
||||||
|
|
||||||
describe 'openstack-orchestration::common' do
|
describe 'openstack-orchestration::common' do
|
||||||
describe 'redhat' do
|
ALL_RHEL.each do |p|
|
||||||
let(:runner) { ChefSpec::SoloRunner.new(REDHAT_OPTS) }
|
context "redhat #{p[:version]}" do
|
||||||
|
let(:runner) { ChefSpec::SoloRunner.new(p) }
|
||||||
let(:node) { runner.node }
|
let(:node) { runner.node }
|
||||||
cached(:chef_run) { runner.converge(described_recipe) }
|
cached(:chef_run) { runner.converge(described_recipe) }
|
||||||
|
|
||||||
|
@ -17,8 +18,17 @@ describe 'openstack-orchestration::common' do
|
||||||
it do
|
it do
|
||||||
expect(chef_run).to upgrade_package 'openstack-heat-common'
|
expect(chef_run).to upgrade_package 'openstack-heat-common'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
case p
|
||||||
|
when REDHAT_7
|
||||||
it do
|
it do
|
||||||
expect(chef_run).to upgrade_package 'MySQL-python'
|
expect(chef_run).to upgrade_package 'MySQL-python'
|
||||||
end
|
end
|
||||||
|
when REDHAT_8
|
||||||
|
it do
|
||||||
|
expect(chef_run).to upgrade_package 'python3-PyMySQL'
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,8 +1,9 @@
|
||||||
require_relative 'spec_helper'
|
require_relative 'spec_helper'
|
||||||
|
|
||||||
describe 'openstack-orchestration::dashboard' do
|
describe 'openstack-orchestration::dashboard' do
|
||||||
describe 'redhat' do
|
ALL_RHEL.each do |p|
|
||||||
let(:runner) { ChefSpec::SoloRunner.new(REDHAT_OPTS) }
|
context "redhat #{p[:version]}" do
|
||||||
|
let(:runner) { ChefSpec::SoloRunner.new(p) }
|
||||||
let(:node) { runner.node }
|
let(:node) { runner.node }
|
||||||
cached(:chef_run) { runner.converge(described_recipe) }
|
cached(:chef_run) { runner.converge(described_recipe) }
|
||||||
|
|
||||||
|
@ -12,3 +13,4 @@ describe 'openstack-orchestration::dashboard' do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
|
@ -1,8 +1,9 @@
|
||||||
require_relative 'spec_helper'
|
require_relative 'spec_helper'
|
||||||
|
|
||||||
describe 'openstack-orchestration::engine' do
|
describe 'openstack-orchestration::engine' do
|
||||||
describe 'redhat' do
|
ALL_RHEL.each do |p|
|
||||||
let(:runner) { ChefSpec::SoloRunner.new(REDHAT_OPTS) }
|
context "redhat #{p[:version]}" do
|
||||||
|
let(:runner) { ChefSpec::SoloRunner.new(p) }
|
||||||
let(:node) { runner.node }
|
let(:node) { runner.node }
|
||||||
cached(:chef_run) { runner.converge(described_recipe) }
|
cached(:chef_run) { runner.converge(described_recipe) }
|
||||||
|
|
||||||
|
@ -22,3 +23,4 @@ describe 'openstack-orchestration::engine' do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
|
@ -1,8 +1,9 @@
|
||||||
require_relative 'spec_helper'
|
require_relative 'spec_helper'
|
||||||
|
|
||||||
describe 'openstack-orchestration::identity_registration' do
|
describe 'openstack-orchestration::identity_registration' do
|
||||||
describe 'redhat' do
|
ALL_RHEL.each do |p|
|
||||||
let(:runner) { ChefSpec::SoloRunner.new(REDHAT_OPTS) }
|
context "redhat #{p[:version]}" do
|
||||||
|
let(:runner) { ChefSpec::SoloRunner.new(p) }
|
||||||
let(:node) { runner.node }
|
let(:node) { runner.node }
|
||||||
cached(:chef_run) { runner.converge(described_recipe) }
|
cached(:chef_run) { runner.converge(described_recipe) }
|
||||||
|
|
||||||
|
@ -145,3 +146,4 @@ describe 'openstack-orchestration::identity_registration' do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
|
@ -8,10 +8,21 @@ RSpec.configure do |config|
|
||||||
config.log_level = :warn
|
config.log_level = :warn
|
||||||
end
|
end
|
||||||
|
|
||||||
REDHAT_OPTS = {
|
REDHAT_7 = {
|
||||||
platform: 'redhat',
|
platform: 'redhat',
|
||||||
version: '7',
|
version: '7',
|
||||||
}.freeze
|
}.freeze
|
||||||
|
|
||||||
|
REDHAT_8 = {
|
||||||
|
platform: 'redhat',
|
||||||
|
version: '8',
|
||||||
|
}.freeze
|
||||||
|
|
||||||
|
ALL_RHEL = [
|
||||||
|
REDHAT_7,
|
||||||
|
REDHAT_8,
|
||||||
|
].freeze
|
||||||
|
|
||||||
UBUNTU_OPTS = {
|
UBUNTU_OPTS = {
|
||||||
platform: 'ubuntu',
|
platform: 'ubuntu',
|
||||||
version: '18.04',
|
version: '18.04',
|
||||||
|
@ -75,9 +86,16 @@ shared_examples 'expect installs common heat package' do
|
||||||
end
|
end
|
||||||
|
|
||||||
shared_examples 'expect installs mysql package' do
|
shared_examples 'expect installs mysql package' do
|
||||||
|
case p
|
||||||
|
when REDHAT_7
|
||||||
it 'installs mysql python packages by default' do
|
it 'installs mysql python packages by default' do
|
||||||
expect(chef_run).to upgrade_package 'MySQL-python'
|
expect(chef_run).to upgrade_package 'MySQL-python'
|
||||||
end
|
end
|
||||||
|
when REDHAT_8
|
||||||
|
it 'installs mysql python packages by default' do
|
||||||
|
expect(chef_run).to upgrade_package 'python3-PyMySQL'
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
shared_examples 'expect runs db migrations' do
|
shared_examples 'expect runs db migrations' do
|
||||||
|
|
Loading…
Reference in New Issue