diff options
| author | Mickaël Canévet <mickael.canevet@camptocamp.com> | 2015-04-23 09:05:30 +0200 |
|---|---|---|
| committer | Mickaël Canévet <mickael.canevet@camptocamp.com> | 2015-04-23 09:05:30 +0200 |
| commit | 9ed393d4e152bb9ef2666449375ac96e890fdbd1 (patch) | |
| tree | df280e71aeceafe0508dcf834e362b7950130a16 | |
| parent | 54b4faefd889d4f8cae5bac4095f0500f421d200 (diff) | |
| download | puppet-dhcp-9ed393d4e152bb9ef2666449375ac96e890fdbd1.tar.gz puppet-dhcp-9ed393d4e152bb9ef2666449375ac96e890fdbd1.tar.bz2 | |
Add Puppet 4 to travis matrix
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | spec/acceptance/nodesets/ubuntu-10.04-x86_64-docker.yml | 12 | ||||
| -rw-r--r-- | spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml | 12 | ||||
| -rw-r--r-- | spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml | 12 | ||||
| -rw-r--r-- | spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml | 2 |
5 files changed, 39 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 51562b5..2fb78c8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,8 @@ 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 deploy: diff --git a/spec/acceptance/nodesets/ubuntu-10.04-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-10.04-x86_64-docker.yml new file mode 100644 index 0000000..523c7cf --- /dev/null +++ b/spec/acceptance/nodesets/ubuntu-10.04-x86_64-docker.yml @@ -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 diff --git a/spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml new file mode 100644 index 0000000..890730a --- /dev/null +++ b/spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml @@ -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 diff --git a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml new file mode 100644 index 0000000..744e027 --- /dev/null +++ b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml @@ -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 diff --git a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml index 073562e..1c163ba 100644 --- a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml +++ b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml @@ -1,5 +1,5 @@ HOSTS: - ubuntu-14.04-x64: + ubuntu-1404-x64: default_apply_opts: strict_variables: platform: ubuntu-14.04-amd64 |