aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Gemfile10
-rw-r--r--Rakefile1
-rw-r--r--spec/acceptance/nodesets/centos-7-x86_64-docker.yml12
-rw-r--r--spec/acceptance/nodesets/centos-7-x86_64-openstack.yml13
-rw-r--r--spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml10
-rw-r--r--spec/acceptance/nodesets/debian-6-x86_64-docker.yml12
-rw-r--r--spec/acceptance/nodesets/debian-7-x86_64-docker.yml12
-rw-r--r--spec/acceptance/nodesets/debian-7-x86_64-openstack.yml13
-rw-r--r--spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml11
-rw-r--r--spec/acceptance/nodesets/debian-8-x86_64-docker.yml12
-rw-r--r--spec/acceptance/nodesets/debian-8-x86_64-openstack.yml13
-rw-r--r--spec/spec_helper.rb15
12 files changed, 118 insertions, 16 deletions
diff --git a/Gemfile b/Gemfile
index 159079f..f0887ec 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,21 +2,27 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org"
group :development, :unit_tests do
gem 'rake', :require => false
- gem 'rspec-puppet', :require => false, :git => 'https://github.com/rodjek/rspec-puppet.git'
+ gem 'rspec-puppet', '~> 2.0', :require => false
gem 'puppetlabs_spec_helper', :require => false
- gem 'puppet-lint', '~> 1.0.0', :require => false
+ gem 'puppet-lint', :require => false
gem 'puppet-lint-unquoted_string-check', :require => false
gem 'puppet-lint-empty_string-check', :require => false
gem 'puppet-lint-spaceship_operator_without_tag-check', :require => false
gem 'puppet-lint-variable_contains_upcase', :require => false
gem 'puppet-lint-absolute_classname-check', :require => false
+ gem 'puppet-lint-undef_in_function-check', :require => false
+ gem 'puppet-lint-leading_zero-check', :require => false
+ gem 'puppet-lint-trailing_comma-check', :require => false
+ gem 'puppet-lint-file_ensure-check', :require => false
gem 'simplecov', :require => false
gem 'rspec-puppet-facts', :require => false
gem 'json', :require => false
gem 'metadata-json-lint', :require => false
+ gem 'docker-api', '1.15.0', :require => false
end
group :system_tests do
+ gem 'beaker', :require => false, :git => 'https://github.com/raphink/beaker', :branch => 'openstack'
gem 'beaker-rspec', :require => false
gem 'serverspec', :require => false
end
diff --git a/Rakefile b/Rakefile
index a81b2c6..a334275 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,6 +1,7 @@
require 'puppetlabs_spec_helper/rake_tasks'
require 'puppet-lint/tasks/puppet-lint'
+Rake::Task[:lint].clear
PuppetLint.configuration.fail_on_warnings
PuppetLint.configuration.send('relative')
PuppetLint.configuration.send('disable_80chars')
diff --git a/spec/acceptance/nodesets/centos-7-x86_64-docker.yml b/spec/acceptance/nodesets/centos-7-x86_64-docker.yml
new file mode 100644
index 0000000..599a681
--- /dev/null
+++ b/spec/acceptance/nodesets/centos-7-x86_64-docker.yml
@@ -0,0 +1,12 @@
+HOSTS:
+ centos-7-x64:
+ default_apply_opts:
+ strict_variables:
+ platform: el-7-x86_64
+ hypervisor : docker
+ image: centos:7
+ # This stops the image from being deleted on completion, speeding up the process.
+ docker_preserve_image: true
+CONFIG:
+ type: foss
+ log_level: debug
diff --git a/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml b/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml
new file mode 100644
index 0000000..37dfc5f
--- /dev/null
+++ b/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml
@@ -0,0 +1,13 @@
+HOSTS:
+ centos-7-x64:
+ default_apply_opts:
+ strict_variables:
+ platform: el-7-x86_64
+ hypervisor : openstack
+ flavor: m1.small
+ image: centos-7-x86_64-genericcloud-20140929_01
+ user: centos
+CONFIG:
+ type: foss
+ log_level: debug
+ openstack_network: default
diff --git a/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml b/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml
new file mode 100644
index 0000000..a9c461b
--- /dev/null
+++ b/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml
@@ -0,0 +1,10 @@
+HOSTS:
+ centos-7-x64:
+ default_apply_opts:
+ strict_variables:
+ platform: el-7-x86_64
+ hypervisor : vagrant
+ box : puppetlabs/centos-6.5-64-nocm
+CONFIG:
+ type: foss
+ log_level: debug
diff --git a/spec/acceptance/nodesets/debian-6-x86_64-docker.yml b/spec/acceptance/nodesets/debian-6-x86_64-docker.yml
new file mode 100644
index 0000000..0296d12
--- /dev/null
+++ b/spec/acceptance/nodesets/debian-6-x86_64-docker.yml
@@ -0,0 +1,12 @@
+HOSTS:
+ debian-6-x64:
+ default_apply_opts:
+ strict_variables:
+ platform: debian-6-amd64
+ hypervisor : docker
+ image: debian:6
+ # This stops the image from being deleted on completion, speeding up the process.
+ docker_preserve_image: true
+CONFIG:
+ type: foss
+ log_level: debug
diff --git a/spec/acceptance/nodesets/debian-7-x86_64-docker.yml b/spec/acceptance/nodesets/debian-7-x86_64-docker.yml
new file mode 100644
index 0000000..ef1c9b2
--- /dev/null
+++ b/spec/acceptance/nodesets/debian-7-x86_64-docker.yml
@@ -0,0 +1,12 @@
+HOSTS:
+ debian-7-x64:
+ default_apply_opts:
+ strict_variables:
+ platform: debian-7-amd64
+ hypervisor : docker
+ image: debian:7
+ # This stops the image from being deleted on completion, speeding up the process.
+ docker_preserve_image: true
+CONFIG:
+ type: foss
+ log_level: debug
diff --git a/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml b/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml
new file mode 100644
index 0000000..e52336b
--- /dev/null
+++ b/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml
@@ -0,0 +1,13 @@
+HOSTS:
+ debian-7-x64:
+ default_apply_opts:
+ strict_variables:
+ platform: debian-7-amd64
+ hypervisor : openstack
+ flavor: m1.small
+ image: debian-7-amd64-20141121
+ user: debian
+CONFIG:
+ type: foss
+ log_level: debug
+ openstack_network: default
diff --git a/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml b/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml
new file mode 100644
index 0000000..97099de
--- /dev/null
+++ b/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml
@@ -0,0 +1,11 @@
+HOSTS:
+ debian-7-x64:
+ default_apply_opts:
+ strict_variables:
+ platform: debian-7-amd64
+ hypervisor : vagrant
+ box : debian-73-x64-virtualbox-nocm
+ box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-73-x64-virtualbox-nocm.box
+CONFIG:
+ type: foss
+ log_level: debug
diff --git a/spec/acceptance/nodesets/debian-8-x86_64-docker.yml b/spec/acceptance/nodesets/debian-8-x86_64-docker.yml
new file mode 100644
index 0000000..28c3e02
--- /dev/null
+++ b/spec/acceptance/nodesets/debian-8-x86_64-docker.yml
@@ -0,0 +1,12 @@
+HOSTS:
+ debian-8-x64:
+ default_apply_opts:
+ strict_variables:
+ platform: debian-8-amd64
+ hypervisor : docker
+ image: debian:8
+ # This stops the image from being deleted on completion, speeding up the process.
+ docker_preserve_image: true
+CONFIG:
+ type: foss
+ log_level: debug
diff --git a/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml b/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml
new file mode 100644
index 0000000..194ca46
--- /dev/null
+++ b/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml
@@ -0,0 +1,13 @@
+HOSTS:
+ debian-8-x64:
+ default_apply_opts:
+ strict_variables:
+ platform: debian-8-amd64
+ hypervisor : openstack
+ flavor: m1.small
+ image: debian-8-amd64-20141121
+ user: debian
+CONFIG:
+ type: foss
+ openstack_network: default
+ log_level: debug
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 1148f7f..86cc740 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -7,24 +7,11 @@ RSpec.configure do |c|
c.include PuppetlabsSpec::Files
c.before :each do
- # Ensure that we don't accidentally cache facts and environment
- # between test cases.
- Facter::Util::Loader.any_instance.stubs(:load_all)
- Facter.clear
- Facter.clear_messages
-
# Store any environment variables away to be restored later
@old_env = {}
ENV.each_key {|k| @old_env[k] = ENV[k]}
- if Gem::Version.new(`puppet --version`) >= Gem::Version.new('3.5')
- Puppet.settings[:strict_variables]=true
- end
-
- if ENV['FUTURE_PARSER'] == 'yes'
- c.parser='future'
- end
-
+ Puppet.settings[:strict_variables]=true if Gem::Version.new(Puppet::PUPPETVERSION) >= Gem::Version.new('3.5')
Puppet.features.stubs(:root?).returns(true)
end
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-08 15:17:06 +0000