From 1506d64c599167b68dee10dc94d2180806c92c63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr@redhat.com>
Date: Wed, 13 May 2015 16:19:35 +0200
Subject: [PATCH] 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
  http://projects.theforeman.org/issues/2650 for details)
* separate nodepool files to have trusty & centos7 support in OS infra
* basic_nova_spec: add case for repo configuration and support
  RH systems.

Change-Id: I745fa76b2b36b0dbada83260fedffc4ee60f9c03
Closes-bug: #1444736
---
 Gemfile                                       |  1 +
 spec/acceptance/basic_nova_spec.rb            | 32 ++++++++++++++++---
 spec/acceptance/nodesets/nodepool-centos7.yml |  9 ++++++
 .../{nodepool.yml => nodepool-trusty.yml}     |  0
 spec/spec_helper_acceptance.rb                |  6 +++-
 5 files changed, 43 insertions(+), 5 deletions(-)
 create mode 100644 spec/acceptance/nodesets/nodepool-centos7.yml
 rename spec/acceptance/nodesets/{nodepool.yml => nodepool-trusty.yml} (100%)

diff --git a/Gemfile b/Gemfile
index 571fd65dc..4c65317ac 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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'
diff --git a/spec/acceptance/basic_nova_spec.rb b/spec/acceptance/basic_nova_spec.rb
index 8d4c393cb..190b3c1a1 100644
--- a/spec/acceptance/basic_nova_spec.rb
+++ b/spec/acceptance/basic_nova_spec.rb
@@ -9,10 +9,33 @@ describe 'basic nova' do
       Exec { logoutput => 'on_failure' }
 
       # Common resources
-      include ::apt
-      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,
+          }
+          $package_provider = 'apt'
+        }
+        '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,
+              },
+            },
+          }
+          $package_provider = 'yum'
+        }
+        default: {
+          fail("Unsupported osfamily (${::osfamily})")
+        }
       }
 
       class { '::mysql::server': }
@@ -20,6 +43,7 @@ describe 'basic nova' do
       class { '::rabbitmq':
         delete_guest_user => true,
         erlang_cookie     => 'secrete',
+        package_provider  => $package_provider,
       }
 
       rabbitmq_vhost { '/':
diff --git a/spec/acceptance/nodesets/nodepool-centos7.yml b/spec/acceptance/nodesets/nodepool-centos7.yml
new file mode 100644
index 000000000..aed4f0b26
--- /dev/null
+++ b/spec/acceptance/nodesets/nodepool-centos7.yml
@@ -0,0 +1,9 @@
+HOSTS:
+  centos-70-x64:
+    roles:
+      - master
+    platform: el-7-x86_64
+    hypervisor : none
+    ip: 127.0.0.1
+CONFIG:
+  type: foss
diff --git a/spec/acceptance/nodesets/nodepool.yml b/spec/acceptance/nodesets/nodepool-trusty.yml
similarity index 100%
rename from spec/acceptance/nodesets/nodepool.yml
rename to spec/acceptance/nodesets/nodepool-trusty.yml
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index b3da96551..19d51c115 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -31,7 +31,8 @@ RSpec.configure do |c|
       on host, puppet('module','install','duritong/sysctl'), { :acceptable_exit_codes => 0 }
       on host, puppet('module','install','puppetlabs-inifile'), { :acceptable_exit_codes => 0 }
       on host, puppet('module','install','stahnma-epel'), { :acceptable_exit_codes => 0 }
-      on host, puppet('module','install','puppetlabs-rabbitmq'), { :acceptable_exit_codes => 0 }
+      # pin apt module until openstack_extras use >= 2.0.0 version
+      on host, puppet('module','install','puppetlabs-apt','--version','1.8.0'), { :acceptable_exit_codes => 0 }
 
       # install puppet modules from git, use master
       shell('git clone https://git.openstack.org/stackforge/puppet-openstacklib /etc/puppet/modules/openstacklib')
@@ -39,6 +40,9 @@ RSpec.configure do |c|
       shell('git clone https://git.openstack.org/stackforge/puppet-keystone /etc/puppet/modules/keystone')
       shell('git clone https://git.openstack.org/stackforge/puppet-cinder /etc/puppet/modules/cinder')
       shell('git clone https://git.openstack.org/stackforge/puppet-glance /etc/puppet/modules/glance')
+      # TODO(EmilienM) Cloning RabbitMQ module for now because we wait for a release including
+      # https://github.com/enovance/puppetlabs-rabbitmq/commit/0227f762070ffbbea3c28d6a60174de98fa4cc1c
+      shell('git clone https://github.com/puppetlabs/puppetlabs-rabbitmq/ /etc/puppet/modules/rabbitmq')
 
       # Install the module being tested
       puppet_module_install(:source => proj_root, :module_name => 'nova')