Commit ec4de5e9 authored by Scott Barthelemy's avatar Scott Barthelemy Committed by Fabien Combernous

Resolve "specify versionsof used modules into file spec_helper_acceptance.rb"

parent 9ca94322
...@@ -10,7 +10,11 @@ ...@@ -10,7 +10,11 @@
"dependencies": [ "dependencies": [
{ {
"name": "puppetlabs-stdlib", "name": "puppetlabs-stdlib",
"version_requirement": ">= 5.0.0 < 6.0.0" "version_requirement": ">= 4.25.0 < 6.0.0"
},
{
"name": "stahnma-epel",
"version_requirement": ">= 1.3.1 < 2.0.0"
} }
], ],
"operatingsystem_support": [ "operatingsystem_support": [
......
...@@ -3,22 +3,25 @@ require 'beaker-puppet' ...@@ -3,22 +3,25 @@ require 'beaker-puppet'
require 'beaker/puppet_install_helper' require 'beaker/puppet_install_helper'
require 'beaker/module_install_helper' require 'beaker/module_install_helper'
# PUPPET_INSTALL_VERSION = 5+
run_puppet_install_helper run_puppet_install_helper
install_module_on(hosts) install_module_on(hosts)
install_module_dependencies_on(hosts)
# The module saz-resolv_conf, used by this helper, requires puppetlabs-stdlibs < 5.0.0.
# The puppet-freeipa dependencies descrived by metadata.json installs puppetlabs-stdlib > 5.0.0.
# It is prefered, for the moment, to not use the helping function
# install_module_dependencies_on() until saz-resolv_conf accepts puppetlabs-stdlib > 5.0.0
#
# By this way, users of puppet-freeipa can use puppetlabs-stdlibs version > 5.0.0.
# and acceptance tests can use puppetlabs-stdlibs version < 5.0.0
#install_module_dependencies_on(hosts)
RSpec.configure do |c| RSpec.configure do |c|
# Configure all nodes in nodeset # Configure all nodes in nodeset
c.before :suite do c.before :suite do
hosts.each do |host| hosts.each do |host|
on host, puppet('module', 'install', 'puppetlabs-concat') install_module_from_forge_on(host, 'saz-resolv_conf', '>= 4.0.0 < 5.0.0')
on host, puppet('module', 'install', 'puppetlabs-stdlib') install_module_from_forge_on(host, 'puppetlabs-stdlib', '>= 4.25.0 < 5.0.0')
on host, puppet('module', 'install', 'crayfishx-firewalld') install_module_from_forge_on(host, 'stahnma-epel', '>= 1.3.1 < 2.0.0')
on host, puppet('module', 'install', 'puppet-selinux')
on host, puppet('module', 'install', 'saz-resolv_conf')
on host, puppet('module', 'install', 'stahnma-epel')
pp = <<-EOS pp = <<-EOS
exec { 'stop network manager': exec { 'stop network manager':
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment