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

Update with modulesync

parent afc19607

.travis.yml

+11 −7
Changes for .travis.yml: 11 added lines, 7 removed lines.
Original line number Diff line number Diff line 
---

language: ruby

sudo: false

addons:

  apt:

    packages:

      - 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"]
@@ -22,43 +26,43 @@ matrix: 
    services: docker

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

    bundler_args:

    script: bundle exec rspec spec/acceptance/*_spec.rb

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

  - rvm: default

    sudo: required

    services: docker

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

    bundler_args:

    script: bundle exec rspec spec/acceptance/*_spec.rb

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

  - rvm: default

    sudo: required

    services: docker

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

    bundler_args:

    script: bundle exec rspec spec/acceptance/*_spec.rb

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

  - rvm: default

    sudo: required

    services: docker

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

    bundler_args:

    script: bundle exec rspec spec/acceptance/*_spec.rb

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

  - rvm: default

    sudo: required

    services: docker

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

    bundler_args:

    script: bundle exec rspec spec/acceptance/*_spec.rb

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

  - rvm: default

    sudo: required

    services: docker

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

    bundler_args:

    script: bundle exec rspec spec/acceptance/*_spec.rb

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

  - rvm: default

    sudo: required

    services: docker

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

    bundler_args:

    script: bundle exec rspec spec/acceptance/*_spec.rb

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

notifications:

  email: false

deploy:

Gemfile

+2 −1
Changes for Gemfile: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -21,7 +21,8 @@ group :development, :unit_tests do 
  gem 'puppet-lint-file_source_rights-check',              :require => false

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

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

  gem 'github_changelog_generator',                        :require => false, :git => 'https://github.com/raphink/github-changelog-generator.git', :branch => 'dev/all_patches' if RUBY_VERSION !~ /^1.8/

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

  gem 'github_changelog_generator',                        :require => false if RUBY_VERSION !~ /^1.8/

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

end

spec/acceptance/nodesets/centos-5-x86_64-docker.yml

+2 −2
Changes for spec/acceptance/nodesets/centos-5-x86_64-docker.yml: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -5,11 +5,11 @@ HOSTS: 
      strict_variables:

    platform: el-5-x86_64

    hypervisor : docker

    image: centos:5

    image: tianon/centos:5.10

    docker_preserve_image: true

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

    docker_image_commands:

      - 'yum install -y crontabs tar wget'

      - 'yum install -y crontabs tar wget which'

CONFIG:

  type: foss

  log_level: debug

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

+1 −0
Changes for spec/acceptance/nodesets/centos-6-x86_64-docker.yml: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ HOSTS: 
    docker_preserve_image: true

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

    docker_image_commands:

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

      - 'yum install -y crontabs tar wget'

CONFIG:

  type: foss

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

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

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

    docker_image_commands:

      - 'apt-get install -y wget'

      - 'apt-get install -y cron locales-all net-tools wget'

CONFIG:

  type: foss

  log_level: debug