Skip to content

Commit

Permalink
Add Puppet 4 to travis matrix
Browse files Browse the repository at this point in the history
  • Loading branch information
mcanevet committed Apr 23, 2015
1 parent 243b0d4 commit 2a5b51a
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,7 @@ 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"
notifications:
email: false
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
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
2 changes: 1 addition & 1 deletion spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.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

0 comments on commit 2a5b51a

Please sign in to comment.