5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ matrix:
env: PUPPET_GEM_VERSION="~> 3.0"
- rvm: 2.0.0
env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
- rvm: 2.1.0
env: PUPPET_GEM_VERSION="~> 4.0"
allow_failures:
- rvm: 2.1.0
env: PUPPET_GEM_VERSION="~> 4.0"
notifications:
email: false
deploy:
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 2015-04-27 - Release 0.1.8

Add nodeset ubuntu-12.04-x86_64-openstack

## 2015-04-03 - Release 0.1.7

- Confine rspec pinning to ruby 1.8
7 changes: 4 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,14 @@ group :development, :unit_tests do
gem 'puppet-lint-trailing_comma-check', :require => false
gem 'puppet-lint-file_ensure-check', :require => false
gem 'puppet-lint-version_comparison-check', :require => false
gem 'puppet-lint-fileserver-check', :require => false
gem 'rspec-puppet-facts', :require => false
end

group :system_tests do
gem 'beaker', :require => false
gem 'beaker-rspec', :require => false
gem 'serverspec', :require => false
gem 'beaker', '< 2.10', :require => false
gem 'beaker-rspec', :require => false
gem 'serverspec', :require => false
end

if facterversion = ENV['FACTER_GEM_VERSION']
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "camptocamp-systemd",
"version": "0.1.7",
"version": "0.1.8",
"author": "Camptocamp",
"summary": "Puppet Systemd module",
"license": "Apache-2.0",
Expand Down
12 changes: 12 additions & 0 deletions spec/acceptance/nodesets/centos-5-x86_64-docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
HOSTS:
centos-5-x64:
default_apply_opts:
strict_variables:
platform: el-5-x86_64
hypervisor : docker
image: centos:5
# This stops the image from being deleted on completion, speeding up the process.
docker_preserve_image: true
CONFIG:
type: foss
log_level: debug
12 changes: 12 additions & 0 deletions spec/acceptance/nodesets/ubuntu-10.04-x86_64-docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
HOSTS:
ubuntu-1004-x64:
default_apply_opts:
strict_variables:
platform: ubuntu-10.04-amd64
hypervisor : docker
image: ubuntu:10.04
# This stops the image from being deleted on completion, speeding up the process.
docker_preserve_image: true
CONFIG:
type: foss
log_level: debug
12 changes: 12 additions & 0 deletions spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
HOSTS:
ubuntu-1204-x64:
default_apply_opts:
strict_variables:
platform: ubuntu-12.04-amd64
hypervisor : docker
image: ubuntu:12.04
# This stops the image from being deleted on completion, speeding up the process.
docker_preserve_image: true
CONFIG:
type: foss
log_level: debug
13 changes: 13 additions & 0 deletions spec/acceptance/nodesets/ubuntu-12.04-x86_64-openstack.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
HOSTS:
ubuntu-1204-x64:
default_apply_opts:
strict_variables:
platform: ubuntu-12.04-amd64
hypervisor : openstack
flavor: m1.small
image: ubuntu-1204-latest
user: ubuntu
CONFIG:
type: foss
log_level: debug
openstack_network: default
12 changes: 12 additions & 0 deletions spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
HOSTS:
ubuntu-1404-x64:
default_apply_opts:
strict_variables:
platform: ubuntu-14.04-amd64
hypervisor : docker
image: ubuntu:14.04
# This stops the image from being deleted on completion, speeding up the process.
docker_preserve_image: true
CONFIG:
type: foss
log_level: debug
13 changes: 13 additions & 0 deletions spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
HOSTS:
ubuntu-1404-x64:
default_apply_opts:
strict_variables:
platform: ubuntu-14.04-amd64
hypervisor : openstack
flavor: m1.small
image: ubuntu-1404-latest
user: ubuntu
CONFIG:
type: foss
log_level: debug
openstack_network: default
2 changes: 1 addition & 1 deletion spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
HOSTS:
ubuntu-14.04-x64:
ubuntu-1404-x64:
default_apply_opts:
strict_variables:
platform: ubuntu-14.04-amd64
Expand Down