From 47843411bd967c11f88b09efcefa4977910dce62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?=
<mickael.canevet@camptocamp.com>
Date: Thu, 23 Apr 2015 09:08:48 +0200
Subject: [PATCH] Add Puppet 4 to travis matrix
---
.travis.yml | 2 ++
.../nodesets/ubuntu-10.04-x86_64-docker.yml | 12 ++++++++++++
.../nodesets/ubuntu-12.04-x86_64-docker.yml | 12 ++++++++++++
.../nodesets/ubuntu-14.04-x86_64-docker.yml | 12 ++++++++++++
.../nodesets/ubuntu-14.04-x86_64-openstack.yml | 2 +-
5 files changed, 39 insertions(+), 1 deletion(-)
create mode 100644 spec/acceptance/nodesets/ubuntu-10.04-x86_64-docker.yml
create mode 100644 spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml
create mode 100644 spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml
diff --git a/.travis.yml b/.travis.yml
index c464fd4..7b00d50 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
--
GitLab