Commit 79cc1cd7 authored by Zachary Kent's avatar Zachary Kent Committed by Austin Blatt

(maint) Update beaker to version 4

parent 3b99335b
......@@ -23,6 +23,7 @@ end
gem 'facter'
gem 'rake'
gem 'packaging', *location_for(ENV['PACKAGING_VERSION'] || '~> 0.99')
gem 'beaker-puppet', '~> 1.0'
group :test do
# Add test-unit for ruby 2.2+ support (has been removed from stdlib)
......@@ -66,9 +67,11 @@ if ENV['NO_ACCEPTANCE'] != 'true'
gem 'beaker', *location_for(beaker_version)
else
# use the pinned version
gem 'beaker', '~> 3.4'
gem 'beaker', '~> 4.1'
end
end
gem 'beaker-hostgenerator', '1.1.13'
gem 'beaker-abs', *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.2')
gem 'beaker-vmpooler', *location_for(ENV['BEAKER_VMPOOLER_VERSION'] || "~> 1.3")
gem 'beaker-puppet', '~> 1.0'
end
require 'cgi'
require 'beaker/dsl/install_utils'
require 'beaker/dsl/helpers'
require 'beaker-puppet'
require 'open3'
require 'pp'
require 'set'
......@@ -11,7 +12,7 @@ require 'inifile'
module PuppetDBExtensions
include Test::Unit::Assertions
GitReposDir = Beaker::DSL::InstallUtils::SourcePath
GitReposDir = Beaker::DSL::InstallUtils::FOSSUtils::SourcePath
# We include the Puppet path here so we can use the Puppet ecosystem when
# using rake, which needs the facter gem to work - AIO ruby contains this
......@@ -867,7 +868,7 @@ EOS
def install_puppet_from_package
hosts.each do |host|
install_package(host, 'puppet-agent')
install_puppet_on(host, {})
on( host, puppet('resource', 'host', 'updates.puppetlabs.com', 'ensure=present', "ip=127.0.0.1") )
install_package(host, 'puppetserver')
end
......
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