Skip to content

Commit

Permalink
(FM-4049) Update to current msync configs [2c99161]
Browse files Browse the repository at this point in the history
  • Loading branch information
DavidS committed Jan 27, 2016
1 parent bc1c44a commit 7889a85
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 44 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ spec/fixtures/
.vagrant/
.bundle/
coverage/
log/
.idea/
*.iml
log/
2 changes: 2 additions & 0 deletions .rspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
--color
--format documentation
12 changes: 4 additions & 8 deletions .sync.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
---
.travis.yml:
extras:
- rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
- rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
spec/spec_helper.rb:
unmanaged: true
Gemfile:
optional:
':development, :unit_tests':
- gem: rspec-puppet-facts
19 changes: 7 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,19 @@
---
sudo: false
language: ruby
cache: bundler
bundler_args: --without system_tests
script: "bundle exec rake validate lint spec SPEC_OPTS='--format documentation'"
script: "bundle exec rake validate lint spec"
matrix:
fast_finish: true
include:
- rvm: 1.8.7
- rvm: 2.1.6
env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
- rvm: 2.1.5
env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
- rvm: 2.1.5
env: PUPPET_GEM_VERSION="~> 3.0"
- rvm: 1.9.3
env: PUPPET_GEM_VERSION="~> 3.0"
- rvm: 2.1.5
env: PUPPET_GEM_VERSION="~> 3.0"
- rvm: 2.1.5
env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
- rvm: 2.1.6
env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
- rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
- rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
notifications:
email: false
27 changes: 10 additions & 17 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,17 @@ def location_for(place, fake_version = nil)
end

group :development, :unit_tests do
# rspec-core 3.1.7 is the last version to support ruby 1.8
if RUBY_VERSION < '1.9'
gem 'rspec-core', '3.1.7'
else
# newer version required to avoid BKR-537
gem 'rspec-core', '>= 3.4'
end

gem 'puppetlabs_spec_helper', :require => false
gem 'simplecov', :require => false
gem 'json', :require => false
gem 'metadata-json-lint', :require => false
gem 'rspec-puppet-facts', :require => false
gem 'json', :require => false
gem 'metadata-json-lint', :require => false
gem 'puppet_facts', :require => false
gem 'puppet-blacksmith', :require => false
gem 'puppetlabs_spec_helper', :require => false
gem 'rspec-puppet', '>= 2.3.2', :require => false
gem 'simplecov', :require => false
gem 'rspec-puppet-facts', :require => false
end

group :system_tests do
gem 'beaker-puppet_install_helper', :require => false
if beaker_version = ENV['BEAKER_VERSION']
gem 'beaker', *location_for(beaker_version)
end
Expand All @@ -35,12 +30,10 @@ group :system_tests do
else
gem 'beaker-rspec', :require => false
end
gem 'master_manipulator', :require => false
gem 'serverspec', :require => false
gem 'beaker-puppet_install_helper', :require => false
end



if facterversion = ENV['FACTER_GEM_VERSION']
gem 'facter', facterversion, :require => false
else
Expand Down
3 changes: 2 additions & 1 deletion Rakefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
require 'puppetlabs_spec_helper/rake_tasks'
require 'puppet_blacksmith/rake_tasks'
require 'puppet-lint/tasks/puppet-lint'
require 'puppetlabs_spec_helper/rake_tasks'

PuppetLint.configuration.fail_on_warnings = true
PuppetLint.configuration.send('relative')
Expand Down
10 changes: 5 additions & 5 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require 'puppetlabs_spec_helper/module_spec_helper'
require 'rspec-puppet-facts'
include RspecPuppetFacts

# The default set of platforms to test again.
ENV['UNIT_TEST_PLATFORMS'] = 'centos-6-x86_64 ubuntu-1404-x86_64'
PLATFORMS = ENV['UNIT_TEST_PLATFORMS'].split(' ')
# put local configuration and setup into spec_helper_local
begin
require 'spec_helper_local'
rescue LoadError
end
3 changes: 3 additions & 0 deletions spec/spec_helper_local.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
require 'rspec-puppet-facts'
include RspecPuppetFacts

0 comments on commit 7889a85

Please sign in to comment.