Commit 53ac9c32 authored by Raphaël Pinson's avatar Raphaël Pinson
Browse files

Modulesync

parent 9e881cf0

.travis.yml

+0 −1
Changes for .travis.yml: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ matrix: 
    env: PUPPET_GEM_VERSION="~> 3.0"

  - rvm: 2.0.0

    env: PUPPET_GEM_VERSION="~> 3.0"

  allow_failures:

  - rvm: 2.0.0

    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"

notifications:

Gemfile

+3 −1
Changes for Gemfile: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org" 


group :development, :unit_tests do

  gem 'rake',                                              :require => false

  gem 'rspec-puppet',                                      :require => false, :git => 'https://github.com/rodjek/rspec-puppet.git'

  gem 'rspec-puppet',                                      :require => false

  gem 'puppetlabs_spec_helper',                            :require => false

  gem 'puppet-lint', '~> 1.0.0',                           :require => false

  gem 'puppet-lint-unquoted_string-check',                 :require => false
@@ -10,6 +10,7 @@ group :development, :unit_tests do 
  gem 'puppet-lint-spaceship_operator_without_tag-check',  :require => false

  gem 'puppet-lint-variable_contains_upcase',              :require => false

  gem 'puppet-lint-absolute_classname-check',              :require => false

  gem 'puppet-lint-undef_in_function-check',               :require => false

  gem 'simplecov',                                         :require => false

  gem 'rspec-puppet-facts',                                :require => false

  gem 'json',                                              :require => false
@@ -17,6 +18,7 @@ group :development, :unit_tests do 
end



group :system_tests do

  gem 'beaker',        :require => false, :git => 'https://github.com/mcanevet/beaker', :branch => 'openstack'

  gem 'beaker-rspec',  :require => false

  gem 'serverspec',    :require => false

end

spec/acceptance/nodesets/debian-6-x86_64-docker.yml

0 → 100644
+12 −0
Changes for spec/acceptance/nodesets/debian-6-x86_64-docker.yml: 12 added lines, 0 removed lines.
Original line number Diff line number Diff line 
HOSTS:

  debian-6-x86_64:

    default_apply_opts:

      strict_variables:

    platform: debian-6-amd64

    hypervisor : docker

    image: debian:6

    # This stops the image from being deleted on completion, speeding up the process.

    docker_preserve_image: true

CONFIG:

  type: foss

  log_level: debug

spec/acceptance/nodesets/debian-7-x86_64-docker.yml

+1 −1
Changes for spec/acceptance/nodesets/debian-7-x86_64-docker.yml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ HOSTS: 
      strict_variables:

    platform: debian-7-amd64

    hypervisor : docker

    image: debian:7.5

    image: debian:7

    # This stops the image from being deleted on completion, speeding up the process.

    docker_preserve_image: true

CONFIG:

spec/acceptance/nodesets/debian-8-x86_64-docker.yml

0 → 100644
+12 −0
Changes for spec/acceptance/nodesets/debian-8-x86_64-docker.yml: 12 added lines, 0 removed lines.
Original line number Diff line number Diff line 
HOSTS:

  debian-8-x86_64:

    default_apply_opts:

      strict_variables:

    platform: debian-8-amd64

    hypervisor : docker

    image: debian:8

    # This stops the image from being deleted on completion, speeding up the process.

    docker_preserve_image: true

CONFIG:

  type: foss

  log_level: debug