aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaphaël Pinson <raphael.pinson@camptocamp.com>2015-02-03 10:51:47 +0100
committerRaphaël Pinson <raphael.pinson@camptocamp.com>2015-02-03 10:51:47 +0100
commit99a516b4ebf4dbdc08b1ffaae4b179e3d013f146 (patch)
tree9c8aeaf2e825605d7e11ef5352bce134e786e642
parent88cfaf14e690867f22b9e1ad9b731c477d8cfaad (diff)
downloadpuppet-dhcp-99a516b4ebf4dbdc08b1ffaae4b179e3d013f146.tar.gz
puppet-dhcp-99a516b4ebf4dbdc08b1ffaae4b179e3d013f146.tar.bz2
Modulesync
-rw-r--r--.travis.yml5
-rw-r--r--Gemfile4
-rw-r--r--spec/acceptance/nodesets/debian-6-x86_64-docker.yml12
-rw-r--r--spec/acceptance/nodesets/debian-7-x86_64-docker.yml2
-rw-r--r--spec/acceptance/nodesets/debian-8-x86_64-docker.yml12
5 files changed, 30 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 0ca5653..51562b5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,9 +13,8 @@ matrix:
env: PUPPET_GEM_VERSION="~> 3.0"
- rvm: 2.0.0
env: PUPPET_GEM_VERSION="~> 3.0"
- allow_failures:
- - rvm: 2.0.0
- env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
+ - rvm: 2.0.0
+ env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
notifications:
email: false
deploy:
diff --git a/Gemfile b/Gemfile
index 159079f..a47fea7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@ 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', :require => false
gem 'puppetlabs_spec_helper', :require => false
gem 'puppet-lint', '~> 1.0.0', :require => false
gem 'puppet-lint-unquoted_string-check', :require => false
@@ -10,6 +10,7 @@ group :development, :unit_tests do
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 'simplecov', :require => false
gem 'rspec-puppet-facts', :require => false
gem 'json', :require => false
@@ -17,6 +18,7 @@ group :development, :unit_tests do
end
group :system_tests do
+ gem 'beaker', :require => false, :git => 'https://github.com/mcanevet/beaker', :branch => 'openstack'
gem 'beaker-rspec', :require => false
gem 'serverspec', :require => false
end
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..b6cf1e6
--- /dev/null
+++ b/spec/acceptance/nodesets/debian-6-x86_64-docker.yml
@@ -0,0 +1,12 @@
+HOSTS:
+ debian-6-x86_64:
+ 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
index 64f2534..e7b916b 100644
--- a/spec/acceptance/nodesets/debian-7-x86_64-docker.yml
+++ b/spec/acceptance/nodesets/debian-7-x86_64-docker.yml
@@ -4,7 +4,7 @@ HOSTS:
strict_variables:
platform: debian-7-amd64
hypervisor : docker
- image: debian:7.5
+ image: debian:7
# This stops the image from being deleted on completion, speeding up the process.
docker_preserve_image: true
CONFIG:
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..ef99efb
--- /dev/null
+++ b/spec/acceptance/nodesets/debian-8-x86_64-docker.yml
@@ -0,0 +1,12 @@
+HOSTS:
+ debian-8-x86_64:
+ 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