Commit bcb2de1e authored by Mickaël Canévet's avatar Mickaël Canévet
Browse files

Update with modulesync

parent 44313aa1

.travis.yml

+8 −8
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ addons: 
      - libaugeas-dev

cache: bundler

bundler_args: --without system_tests

script: ["bundle exec rake validate", "bundle exec rake lint", "bundle exec rake spec SPEC_OPTS='--format documentation'", "bundle exec rake metadata"]

script: ["bundle exec rake validate", "bundle exec rake lint", "bundle exec rake spec SPEC_OPTS='--format documentation'"]

matrix:

  fast_finish: true

  include:
@@ -25,49 +25,49 @@ matrix: 
    sudo: required

    dist: trusty

    services: docker

    env: BEAKER_set="debian-6-x86_64-docker"

    env: BEAKER_set="debian-6"

    bundler_args:

    script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb

  - rvm: default

    sudo: required

    dist: trusty

    services: docker

    env: BEAKER_set="debian-7-x86_64-docker"

    env: BEAKER_set="debian-7"

    bundler_args:

    script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb

  - rvm: default

    sudo: required

    dist: trusty

    services: docker

    env: BEAKER_set="debian-8-x86_64-docker"

    env: BEAKER_set="debian-8"

    bundler_args:

    script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb

  - rvm: default

    sudo: required

    dist: trusty

    services: docker

    env: BEAKER_set="ubuntu-12.04-x86_64-docker"

    env: BEAKER_set="ubuntu-12.04"

    bundler_args:

    script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb

  - rvm: default

    sudo: required

    dist: trusty

    services: docker

    env: BEAKER_set="ubuntu-14.04-x86_64-docker"

    env: BEAKER_set="ubuntu-14.04"

    bundler_args:

    script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb

  - rvm: default

    sudo: required

    dist: trusty

    services: docker

    env: BEAKER_set="centos-6-x86_64-docker"

    env: BEAKER_set="centos-6"

    bundler_args:

    script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb

  - rvm: default

    sudo: required

    dist: trusty

    services: docker

    env: BEAKER_set="centos-7-x86_64-docker"

    env: BEAKER_set="centos-7"

    bundler_args:

    script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb

notifications:

Gemfile

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ group :development, :unit_tests do 
  gem 'puppet-lint-alias-check',                           :require => false

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

  gem 'ruby-augeas',                                       :require => false

  gem 'github_changelog_generator',                        :require => false if RUBY_VERSION !~ /^1\.8/

  gem 'github_changelog_generator', '< 1.10.2',            :require => false if RUBY_VERSION !~ /^1\.8/

  gem 'puppet-blacksmith',                                 :require => false if RUBY_VERSION !~ /^1\./

end

spec/acceptance/nodesets/centos-5.yml

0 → 100644
+15 −0
Original line number Diff line number Diff line 
HOSTS:

  centos-5-x64:

    default_apply_opts:

      order: random

      strict_variables:

    platform: el-5-x86_64

    hypervisor : docker

    image: tianon/centos:5.10

    docker_preserve_image: true

    docker_cmd: '["/sbin/init"]'

    docker_image_commands:

      - 'yum install -y crontabs tar wget which'

CONFIG:

  type: aio

  log_level: debug

spec/acceptance/nodesets/centos-6.yml

0 → 100644
+16 −0
Original line number Diff line number Diff line 
HOSTS:

  centos-6-x64:

    default_apply_opts:

      order: random

      strict_variables:

    platform: el-6-x86_64

    hypervisor : docker

    image: centos:6

    docker_preserve_image: true

    docker_cmd: '["/sbin/init"]'

    docker_image_commands:

      - 'rm -rf /var/run/network/*'

      - 'yum install -y crontabs tar wget'

CONFIG:

  type: aio

  log_level: debug

spec/acceptance/nodesets/centos-7.yml

0 → 100644
+15 −0
Original line number Diff line number Diff line 
HOSTS:

  centos-7-x64:

    default_apply_opts:

      order: random

      strict_variables:

    platform: el-7-x86_64

    hypervisor : docker

    image: centos:7

    docker_preserve_image: true

    docker_cmd: '["/usr/sbin/init"]'

    docker_image_commands:

      - 'yum install -y crontabs tar wget'

CONFIG:

  type: aio

  log_level: debug