Merge pull request #37 from jhoblitt/maint/test_infra

Maint/test infra

.fixtures.yml

@@ -8,6 +8,9 @@ fixtures:
       ref: 'v1.2.2'
     logrotate:
       repo: 'git://github.com/rodjek/puppet-logrotate.git'
-      ref: '1.1.1'
+      # The current forge release (1.1.1) of logrotate is not compatible with
+      # the future parser. See:
+      # https://github.com/rodjek/puppet-logrotate/pull/39
+      ref: 'd569bcee1b43fa1af816c21afb5664d8e5235553'
   symlinks:
     selenium: "#{source_dir}"

.gitignore

@@ -1,12 +1,12 @@
 .bundle
 Gemfile.lock
+junit/
+log/
 *.orig
 *.patch
 pkg/
 *.rej
-.rspec_system/
 spec/fixtures/manifests/
 spec/fixtures/modules/
 *.swp
 .vagrant
-log

.travis.yml

@@ -4,21 +4,19 @@ bundler_args: --without beaker
 rvm:
   - 1.8.7
   - 1.9.3
-  - 2.0.0
-  - 2.1.4
+  - 2.0
+  - 2.1
 env:
   - PUPPET_GEM_VERSION="~> 2.7"
   - PUPPET_GEM_VERSION="~> 3.3"
   - PUPPET_GEM_VERSION="~> 3.7" FUTURE_PARSER="yes"
 matrix:
-  allow_failures:
-    - rvm: ruby-head
   exclude:
     - rvm: 1.9.3
       env: PUPPET_GEM_VERSION="~> 2.7"
-    - rvm: 2.0.0
+    - rvm: 2.0
       env: PUPPET_GEM_VERSION="~> 2.7"
-    - rvm: 2.1.4
+    - rvm: 2.1
       env: PUPPET_GEM_VERSION="~> 2.7"
   fast_finish: true
 notifications:

Gemfile

@@ -6,15 +6,20 @@ else
   gem 'puppet', :require => false
 end
 
+if facterversion = ENV['FACTER_GEM_VERSION']
+  gem 'facter', facterversion, :require => false
+else
+  gem 'facter', :require => false
+end
+
 group :development, :test do
   gem 'rake',                    :require => false
+  # https://github.com/rspec/rspec-core/issues/1864
+  gem 'rspec', '< 3.2.0', {"platforms"=>["ruby_18"]}
   gem 'puppetlabs_spec_helper',  :require => false
   gem 'puppet-lint', '>= 1.1.0', :require => false
   gem 'puppet-syntax',           :require => false
-  gem 'rspec-puppet',
-    :git     => 'https://github.com/rodjek/rspec-puppet.git',
-    :ref     => 'v2.0.0',
-    :require => false
+  gem 'rspec-puppet', '~> 2.0.0', :require => false
 end
 
 group :beaker do

LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2012-2014 Joshua Hoblitt <[email protected]>
+Copyright (C) 2012-2015 Joshua Hoblitt <[email protected]>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

Rakefile

@@ -3,8 +3,11 @@ require 'puppet-syntax/tasks/puppet-syntax'
 require 'puppet-lint/tasks/puppet-lint'
 
 PuppetSyntax.exclude_paths = ['spec/fixtures/**/*']
-PuppetLint.configuration.send('disable_class_inherits_from_params_class')
-PuppetLint.configuration.ignore_paths = ['pkg/**/*.pp', 'spec/**/*.pp', 'tests/**/*.pp']
+
+PuppetLint::RakeTask.new :lint do |config|
+  config.pattern          = 'manifests/**/*.pp'
+  config.fail_on_warnings = true
+end
 
 task :default => [
   :syntax,

spec/acceptance/nodesets/centos-6.6.yml

@@ -0,0 +1,9 @@
+HOSTS:
+  centos-6.6:
+    roles:
+      - master
+    platform: el-6-x86_64
+    box: chef/centos-6.6
+    hypervisor: vagrant
+CONFIG:
+  type: foss

spec/acceptance/nodesets/centos-7.0.yml

@@ -0,0 +1,9 @@
+HOSTS:
+  centos-7.0:
+    roles:
+      - master
+    platform: el-7-x86_64
+    box: chef/centos-7.0
+    hypervisor: vagrant
+CONFIG:
+  type: foss

spec/acceptance/nodesets/default.yml

@@ -1,10 +1,9 @@
 HOSTS:
-  centos-64-x64:
+  centos-7.0:
     roles:
       - master
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
+    platform: el-7-x86_64
+    box: chef/centos-7.0
+    hypervisor: vagrant
 CONFIG:
-  type: git
+  type: foss

spec/acceptance/nodesets/fedora-21.yml

@@ -0,0 +1,9 @@
+HOSTS:
+  fedora-21:
+    roles:
+      - master
+    platform: fedora-21-x86_64
+    box: chef/fedora-21 
+    hypervisor: vagrant
+CONFIG:
+  type: foss

spec/acceptance/nodesets/ubuntu-12.04.yml

@@ -0,0 +1,9 @@
+HOSTS:
+  ubuntu-12.04:
+    roles:
+      - master
+    platform: ubuntu-12.04-amd64
+    box: chef/ubuntu-12.04
+    hypervisor: vagrant
+CONFIG:
+  type: foss

spec/acceptance/nodesets/ubuntu-14.04.yml

@@ -0,0 +1,9 @@
+HOSTS:
+  ubuntu-14.04:
+    roles:
+      - master
+    platform: ubuntu-14.04-amd64
+    box: chef/ubuntu-14.04
+    hypervisor: vagrant
+CONFIG:
+  type: foss

spec/spec_helper_acceptance.rb

@@ -3,11 +3,16 @@
 require 'spec_helper_common'
 
 unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no'
-  if hosts.first.is_pe?
-    install_pe
+  # This will install the latest available package on el and deb based
+  # systems fail on windows and osx, and install via gem on other *nixes
+  foss_opts = {:default_action => 'gem_install'}
+
+  if default.is_pe?; then
+    install_pe;
   else
-    install_puppet
+    install_puppet(foss_opts);
   end
+
   hosts.each do |host|
     on hosts, "mkdir -p #{host['distmoduledir']}"
   end
@@ -25,10 +30,10 @@
     # Install module and dependencies
     puppet_module_install(:source => proj_root, :module_name => 'selenium')
     hosts.each do |host|
-      on host, puppet('module', 'install', 'puppetlabs-stdlib'), { :acceptable_exit_codes => [0,1] }
-      on host, puppet('module', 'install', 'maestrodev-wget'), { :acceptable_exit_codes => [0,1] }
-      on host, puppet('module', 'install', 'rodjek-logrotate'), { :acceptable_exit_codes => [0,1] }
-      on host, puppet('module', 'install', 'puppetlabs-java'), { :acceptable_exit_codes => [0,1] }
+      on host, puppet('module', 'install', 'puppetlabs-stdlib'), { :acceptable_exit_codes => [0, 1] }
+      on host, puppet('module', 'install', 'maestrodev-wget'), { :acceptable_exit_codes => [0, 1] }
+      on host, puppet('module', 'install', 'rodjek-logrotate'), { :acceptable_exit_codes => [0, 1] }
+      on host, puppet('module', 'install', 'puppetlabs-java'), { :acceptable_exit_codes => [0, 1] }
     end
   end
 end