Bring Redhat support to acceptance tests

OpenStack Infra has jobs to run this on both Ubuntu Trusty and CentOS7.

* Add minitest to Gemfile (dependency to run beaker on centos - see 11
  http://projects.theforeman.org/issues/2650 for details)
* separate nodepool files to have trusty & centos7 support in OS infra
* class_spec: add case for repo configuration and support
  RH systems.
* don't install rabbitmq module that is not used (yet)
* install the apt module explicitly since it's no longer installed
  implicitly by the rabbitmq module

Change-Id: I17a571c8d56d55337ee0c8491fb4aad272074cf6
Closes-bug: #1444736
This commit is contained in:
Emilien Macchi 2015-05-12 00:12:04 -04:00 committed by Colleen Murphy
parent d4563e25e7
commit 104829144f
8 changed files with 30 additions and 37 deletions

View File

@ -3,6 +3,7 @@ source 'https://rubygems.org'
group :development, :test do
gem 'puppetlabs_spec_helper', :require => false
gem 'rspec-puppet', '~> 2.1.0', :require => false
gem 'minitest', '~> 4.7', :require => 'minitest/unit'
gem 'metadata-json-lint'
gem 'puppet-lint-param-docs'

View File

@ -9,9 +9,31 @@ describe 'glance class' do
Exec { logoutput => 'on_failure' }
# Common resources
class { '::openstack_extras::repo::debian::ubuntu':
release => 'kilo',
package_require => true,
case $::osfamily {
'Debian': {
include ::apt
class { '::openstack_extras::repo::debian::ubuntu':
release => 'kilo',
package_require => true,
}
}
'RedHat': {
class { '::openstack_extras::repo::redhat::redhat':
# Kilo is not GA yet, so let's use the testing repo
manage_rdo => false,
repo_hash => {
'rdo-kilo-testing' => {
'baseurl' => 'https://repos.fedorapeople.org/repos/openstack/openstack-kilo/testing/el7/',
# packages are not GA so not signed
'gpgcheck' => '0',
'priority' => 97,
},
},
}
}
default: {
fail("Unsupported osfamily (${::osfamily})")
}
}
class { '::mysql::server': }

View File

@ -1,9 +0,0 @@
HOSTS:
centos-70-x64:
roles:
- master
platform: el-7-x86_64
box : puppetlabs/centos-7.0-64-nocm
hypervisor : vagrant
CONFIG:
type: foss

View File

@ -1,5 +1,5 @@
HOSTS:
ubuntu-server-1404-x64:
ubuntu-14.04-amd64:
roles:
- master
platform: ubuntu-14.04-amd64
@ -7,5 +7,4 @@ HOSTS:
box_url : https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm
hypervisor : vagrant
CONFIG:
log_level : debug
type: git
type: foss

View File

@ -1,5 +1,5 @@
HOSTS:
ubuntu-server-1404-x64:
ubuntu-14.04-amd64:
roles:
- master
platform: ubuntu-14.04-amd64

View File

@ -1,9 +0,0 @@
HOSTS:
ubuntu-server-1404-x64:
roles:
- master
platform: ubuntu-14.04-amd64
hypervisor : none
ip: 127.0.0.1
CONFIG:
type: foss

View File

@ -1,11 +0,0 @@
HOSTS:
ubuntu-server-1404-x64:
roles:
- master
platform: ubuntu-14.04-amd64
box : puppetlabs/ubuntu-14.04-64-nocm
box_url : https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm
hypervisor : vagrant
CONFIG:
log_level : debug
type: git

View File

@ -28,9 +28,9 @@ RSpec.configure do |c|
# install library modules from the forge
on host, puppet('module','install', '--force', 'puppetlabs-mysql', '--version', '3.2.0'), { :acceptable_exit_codes => [0,1] }
on host, puppet('module','install','dprince/qpid'), { :acceptable_exit_codes => [0,1] }
on host, puppet('module','install','puppetlabs-apt', '--version', '1.8.0'), { :acceptable_exit_codes => [0,1] }
on host, puppet('module','install','puppetlabs-inifile'), { :acceptable_exit_codes => [0,1] }
on host, puppet('module','install','puppetlabs-stdlib'), { :acceptable_exit_codes => [0,1] }
on host, puppet('module','install','puppetlabs-rabbitmq'), { :acceptable_exit_codes => [0,1] }
on host, puppet('module','install','stahnma-epel'), { :acceptable_exit_codes => [0,1] }
# install puppet modules from git, use master