From 0d443df00953e6835108c8989b7fc801ff34cfda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Tue, 24 Feb 2015 09:38:12 +0100 Subject: Update with msync --- Gemfile | 8 ++------ spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml | 2 +- spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml | 10 ++++++++++ 3 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml diff --git a/Gemfile b/Gemfile index c7aa4a5..f4364ea 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org" group :development, :unit_tests do gem 'rake', :require => false - gem 'rspec-puppet', '~> 2.0', :require => false + gem 'rspec-puppet', :require => false, :git => 'https://github.com/camptocamp/rspec-puppet', :branch => 'rspec3' gem 'puppetlabs_spec_helper', :require => false, :git => 'https://github.com/puppetlabs/puppetlabs_spec_helper', :branch => 'master' gem 'puppet-lint', :require => false gem 'puppet-lint-unquoted_string-check', :require => false @@ -15,15 +15,11 @@ 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 'simplecov', :require => false gem 'rspec-puppet-facts', :require => false - gem 'json', :require => false - gem 'metadata-json-lint', :require => false - gem 'docker-api', '1.15.0', :require => false end group :system_tests do - gem 'beaker', :require => false, :git => 'https://github.com/raphink/beaker', :branch => 'openstack' + gem 'beaker', :require => false, :git => 'https://github.com/mcanevet/beaker', :branch => 'openstack' gem 'beaker-rspec', :require => false gem 'serverspec', :require => false end diff --git a/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml b/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml index a9c461b..6f02769 100644 --- a/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml +++ b/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml @@ -4,7 +4,7 @@ HOSTS: strict_variables: platform: el-7-x86_64 hypervisor : vagrant - box : puppetlabs/centos-6.5-64-nocm + box : camptocamp/centos-7-x86_64 CONFIG: type: foss log_level: debug diff --git a/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml b/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml new file mode 100644 index 0000000..71e8194 --- /dev/null +++ b/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml @@ -0,0 +1,10 @@ +HOSTS: + debian-6-x64: + default_apply_opts: + strict_variables: + platform: debian-6-amd64 + hypervisor : vagrant + box : puppetlabs/debian-6.0.9-64-nocm +CONFIG: + type: foss + log_level: debug -- cgit v1.2.3