Skip to content

Commit

Permalink
(MAINT) Adds beaker/puppet_install_helper gem
Browse files Browse the repository at this point in the history
This will allow the module to be easily tested by Puppet jenkins ci,
and facilitates testing with foss, pe, and agent environments.
  • Loading branch information
bmjen committed Jun 25, 2015
1 parent faf4ed5 commit 6a89073
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 22 deletions.
20 changes: 10 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@ rvm:
- 2.2
script: bundle exec rake test
env:
- PUPPET_VERSION="~> 3.6.0"
- PUPPET_VERSION="~> 3.7.0"
- PUPPET_VERSION="~> 3.8.0"
- PUPPET_VERSION="~> 4.0.0"
- PUPPET_VERSION="~> 4.1.0"
- PUPPET_GEM_VERSION="~> 3.6.0"
- PUPPET_GEM_VERSION="~> 3.7.0"
- PUPPET_GEM_VERSION="~> 3.8.0"
- PUPPET_GEM_VERSION="~> 4.0.0"
- PUPPET_GEM_VERSION="~> 4.1.0"
matrix:
exclude:
- rvm: 1.8.7
env: PUPPET_VERSION="~> 4.0.0"
env: PUPPET_GEM_VERSION="~> 4.0.0"
- rvm: 1.8.7
env: PUPPET_VERSION="~> 4.1.0"
env: PUPPET_GEM_VERSION="~> 4.1.0"
- rvm: 2.2
env: PUPPET_VERSION="~> 3.6.0"
env: PUPPET_GEM_VERSION="~> 3.6.0"
- rvm: 2.2
env: PUPPET_VERSION="~> 3.7.0"
env: PUPPET_GEM_VERSION="~> 3.7.0"
- rvm: 2.2
env: PUPPET_VERSION="~> 3.8.0"
env: PUPPET_GEM_VERSION="~> 3.8.0"
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ By default the tests use a baseline version of Puppet.
If you have Ruby 2.x or want a specific version of Puppet,
you must set an environment variable such as:

export PUPPET_VERSION="~> 3.2.0"
export PUPPET_GEM_VERSION="~> 3.2.0"

Install the dependencies like so...

Expand Down
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ source "http://rubygems.org"

group :test do
gem "rake"
gem "puppet", ENV['PUPPET_VERSION'] || '~> 3.8.0'
gem "puppet", ENV['PUPPET_GEM_VERSION'] || '~> 3.8.0'
gem "puppet-lint"
gem "puppet-lint-unquoted_string-check"
gem "rspec-puppet", :git => 'https://github.com/rodjek/rspec-puppet.git'
Expand All @@ -16,6 +16,7 @@ group :development do
gem "travis"
gem "travis-lint"
gem "beaker", :git => 'https://github.com/puppetlabs/beaker.git'
gem "beaker-puppet_install_helper", :require => false
gem "beaker-rspec"
gem "puppet-blacksmith"
gem "guard-rake"
Expand Down
12 changes: 2 additions & 10 deletions spec/spec_helper_acceptance.rb
Original file line number Diff line number Diff line change
@@ -1,17 +1,9 @@
require 'beaker-rspec/spec_helper'
require 'beaker-rspec/helpers/serverspec'
require 'beaker/puppet_install_helper'
require 'pry'

unless ENV['BEAKER_provision'] == 'no'
hosts.each do |host|
# Install Puppet
if host.is_pe?
install_pe
else
install_puppet
end
end
end
run_puppet_install_helper

RSpec.configure do |c|
# Project root
Expand Down

0 comments on commit 6a89073

Please sign in to comment.