From fcef99165ed2f9184ee9aa8674ad919c04c7f25d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Thu, 29 Jan 2015 15:01:07 +0100 Subject: Update with modulesync --- .travis.yml | 5 +++-- spec/acceptance/nodesets/centos-7-x86_64-docker.yml | 12 ++++++++++++ spec/acceptance/nodesets/centos-7-x86_64-openstack.yml | 13 +++++++++++++ spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml | 10 ++++++++++ spec/acceptance/nodesets/debian-7-x86_64-docker.yml | 12 ++++++++++++ spec/acceptance/nodesets/debian-7-x86_64-openstack.yml | 13 +++++++++++++ spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml | 11 +++++++++++ spec/acceptance/nodesets/debian-8-x86_64-openstack.yml | 13 +++++++++++++ 8 files changed, 87 insertions(+), 2 deletions(-) create mode 100644 spec/acceptance/nodesets/centos-7-x86_64-docker.yml create mode 100644 spec/acceptance/nodesets/centos-7-x86_64-openstack.yml create mode 100644 spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml create mode 100644 spec/acceptance/nodesets/debian-7-x86_64-docker.yml create mode 100644 spec/acceptance/nodesets/debian-7-x86_64-openstack.yml create mode 100644 spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml create mode 100644 spec/acceptance/nodesets/debian-8-x86_64-openstack.yml diff --git a/.travis.yml b/.travis.yml index 2a224fb..09192cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,8 +13,9 @@ matrix: env: PUPPET_GEM_VERSION="~> 3.0" - rvm: 2.0.0 env: PUPPET_GEM_VERSION="~> 3.0" - - rvm: 2.0.0 - env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes" + allow_failures: + - rvm: 2.0.0 + env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes" notifications: email: false deploy: diff --git a/spec/acceptance/nodesets/centos-7-x86_64-docker.yml b/spec/acceptance/nodesets/centos-7-x86_64-docker.yml new file mode 100644 index 0000000..6eb5641 --- /dev/null +++ b/spec/acceptance/nodesets/centos-7-x86_64-docker.yml @@ -0,0 +1,12 @@ +HOSTS: + centos-7-x86_64: + default_apply_opts: + strict_variables: + platform: el-7-x86_64 + hypervisor : docker + image: centos:7 + # 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/centos-7-x86_64-openstack.yml b/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml new file mode 100644 index 0000000..69d1bfc --- /dev/null +++ b/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml @@ -0,0 +1,13 @@ +HOSTS: + centos-7-x86_64: + default_apply_opts: + strict_variables: + platform: el-7-x86_64 + hypervisor : openstack + flavor: m1.small + image: centos-7-x86_64-genericcloud-20140929_01 + user: centos +CONFIG: + type: foss + log_level: debug + openstack_network: default diff --git a/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml b/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml new file mode 100644 index 0000000..d479428 --- /dev/null +++ b/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml @@ -0,0 +1,10 @@ +HOSTS: + centos-7-x86_64: + default_apply_opts: + strict_variables: + platform: el-7-x86_64 + hypervisor : vagrant + box : puppetlabs/centos-6.5-64-nocm +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 new file mode 100644 index 0000000..64f2534 --- /dev/null +++ b/spec/acceptance/nodesets/debian-7-x86_64-docker.yml @@ -0,0 +1,12 @@ +HOSTS: + debian-7-x86_64: + default_apply_opts: + strict_variables: + platform: debian-7-amd64 + hypervisor : docker + image: debian:7.5 + # 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-openstack.yml b/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml new file mode 100644 index 0000000..0643d03 --- /dev/null +++ b/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml @@ -0,0 +1,13 @@ +HOSTS: + debian-7-x86_64: + default_apply_opts: + strict_variables: + platform: debian-7-amd64 + hypervisor : openstack + flavor: m1.small + image: debian-7-amd64-20141121 + user: debian +CONFIG: + type: foss + log_level: debug + openstack_network: default diff --git a/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml b/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml new file mode 100644 index 0000000..30f31ad --- /dev/null +++ b/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml @@ -0,0 +1,11 @@ +HOSTS: + debian-7-x86_64: + default_apply_opts: + strict_variables: + platform: debian-7-amd64 + hypervisor : vagrant + box : debian-73-x64-virtualbox-nocm + box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-73-x64-virtualbox-nocm.box +CONFIG: + type: foss + log_level: debug diff --git a/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml b/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml new file mode 100644 index 0000000..1cc9c6d --- /dev/null +++ b/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml @@ -0,0 +1,13 @@ +HOSTS: + debian-8-x86_64: + default_apply_opts: + strict_variables: + platform: debian-8-amd64 + hypervisor : openstack + flavor: m1.small + image: debian-8-amd64-20141121 + user: debian +CONFIG: + type: foss + openstack_network: default + log_level: debug -- cgit v1.2.3