From 06543c46a3536f9a33f05d689e9f7144b59e781e Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Wed, 2 Nov 2016 22:42:45 +0100 Subject: [PATCH] modulesync 0.15.0 --- .gitignore | 1 + .msync.yml | 2 +- .rubocop.yml | 2 +- Gemfile | 3 ++- spec/acceptance/nodesets/docker/centos-5.yml | 13 +++++-------- spec/acceptance/nodesets/docker/centos-6.yml | 11 ++++------- spec/acceptance/nodesets/docker/centos-7.yml | 11 ++++------- spec/acceptance/nodesets/docker/debian-7.yml | 12 +++++------- spec/acceptance/nodesets/docker/debian-8.yml | 12 +++++------- spec/acceptance/nodesets/docker/ubuntu-12.04.yml | 9 +++------ spec/acceptance/nodesets/docker/ubuntu-14.04.yml | 9 +++------ spec/acceptance/nodesets/docker/ubuntu-16.04.yml | 9 +++------ spec/spec_helper.rb | 11 ++++++++++- 13 files changed, 47 insertions(+), 58 deletions(-) diff --git a/.gitignore b/.gitignore index 3c1af2d4..aa3993d3 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ log/ .idea/ *.iml .*.sw +.yardoc/ diff --git a/.msync.yml b/.msync.yml index fc9aad75..e24f9086 100644 --- a/.msync.yml +++ b/.msync.yml @@ -1 +1 @@ -modulesync_config_version: '0.14.1' +modulesync_config_version: '0.15.0' diff --git a/.rubocop.yml b/.rubocop.yml index e1e0276b..f703c727 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -57,7 +57,7 @@ Style/AndOr: Style/RedundantSelf: Enabled: True -Metric/BlockLength: +Metrics/BlockLength: Enabled: False # Method length is not necessarily an indicator of code quality diff --git a/Gemfile b/Gemfile index 05713780..da262185 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,7 @@ end group :test do gem 'puppetlabs_spec_helper', '~> 1.2.2', :require => false - gem 'rspec-puppet', :require => false, :git => 'https://github.com/rodjek/rspec-puppet.git' + gem 'rspec-puppet', '~> 2.5', :require => false gem 'rspec-puppet-facts', :require => false gem 'rspec-puppet-utils', :require => false gem 'puppet-lint-absolute_classname-check', :require => false @@ -30,6 +30,7 @@ group :test do gem 'json_pure', '<= 2.0.1', :require => false if RUBY_VERSION < '2.0.0' gem 'mocha', '>= 1.2.1', :require => false gem 'coveralls', :require => false if RUBY_VERSION >= '2.0.0' + gem 'simplecov-console', :require => false if RUBY_VERSION >= '2.0.0' end group :development do diff --git a/spec/acceptance/nodesets/docker/centos-5.yml b/spec/acceptance/nodesets/docker/centos-5.yml index 33e6d2eb..c17bc3d0 100644 --- a/spec/acceptance/nodesets/docker/centos-5.yml +++ b/spec/acceptance/nodesets/docker/centos-5.yml @@ -4,19 +4,16 @@ # https://github.com/voxpupuli/modulesync_config HOSTS: centos-5-x64: - default_apply_opts: - order: random - strict_variables: platform: el-5-x86_64 - hypervisor : docker - image: tianon/centos:5.10 + hypervisor: docker + image: centos:5 docker_preserve_image: true docker_cmd: '["/sbin/init"]' docker_image_commands: - - 'yum install -y crontabs tar wget which' + - 'yum install -y crontabs initscripts iproute openssl sysvinit-tools tar wget which' - 'sed -i -e "/mingetty/d" /etc/inittab' CONFIG: - type: aio - log_level: debug + trace_limit: 200 + masterless: true ... # vim: syntax=yaml diff --git a/spec/acceptance/nodesets/docker/centos-6.yml b/spec/acceptance/nodesets/docker/centos-6.yml index 235b050d..d93f884c 100644 --- a/spec/acceptance/nodesets/docker/centos-6.yml +++ b/spec/acceptance/nodesets/docker/centos-6.yml @@ -4,20 +4,17 @@ # https://github.com/voxpupuli/modulesync_config HOSTS: centos-6-x64: - default_apply_opts: - order: random - strict_variables: platform: el-6-x86_64 - hypervisor : docker + 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' + - 'yum install -y crontabs initscripts iproute openssl sysvinit-tools tar wget which' - 'rm /etc/init/tty.conf' CONFIG: - type: aio - log_level: debug + trace_limit: 200 + masterless: true ... # vim: syntax=yaml diff --git a/spec/acceptance/nodesets/docker/centos-7.yml b/spec/acceptance/nodesets/docker/centos-7.yml index 634a4327..886b1eeb 100644 --- a/spec/acceptance/nodesets/docker/centos-7.yml +++ b/spec/acceptance/nodesets/docker/centos-7.yml @@ -4,18 +4,15 @@ # https://github.com/voxpupuli/modulesync_config HOSTS: centos-7-x64: - default_apply_opts: - order: random - strict_variables: platform: el-7-x86_64 - hypervisor : docker + hypervisor: docker image: centos:7 docker_preserve_image: true docker_cmd: '["/usr/sbin/init"]' docker_image_commands: - - 'yum install -y crontabs tar wget iproute' + - 'yum install -y crontabs initscripts iproute openssl sysvinit-tools tar wget which' CONFIG: - type: aio - log_level: debug + trace_limit: 200 + masterless: true ... # vim: syntax=yaml diff --git a/spec/acceptance/nodesets/docker/debian-7.yml b/spec/acceptance/nodesets/docker/debian-7.yml index 75a71fa6..071acbf9 100644 --- a/spec/acceptance/nodesets/docker/debian-7.yml +++ b/spec/acceptance/nodesets/docker/debian-7.yml @@ -4,18 +4,16 @@ # https://github.com/voxpupuli/modulesync_config HOSTS: debian-7-x64: - default_apply_opts: - order: random - strict_variables: platform: debian-7-amd64 - hypervisor : docker + hypervisor: docker image: debian:7 docker_preserve_image: true docker_cmd: '["/sbin/init"]' docker_image_commands: - - 'apt-get install -y cron locales-all net-tools wget' + - 'echo deb http://ftp.debian.org/debian wheezy-backports main >> /etc/apt/sources.list' + - 'apt-get update && apt-get install -y cron locales-all net-tools wget' CONFIG: - type: aio - log_level: debug + trace_limit: 200 + masterless: true ... # vim: syntax=yaml diff --git a/spec/acceptance/nodesets/docker/debian-8.yml b/spec/acceptance/nodesets/docker/debian-8.yml index 9de31382..500bee52 100644 --- a/spec/acceptance/nodesets/docker/debian-8.yml +++ b/spec/acceptance/nodesets/docker/debian-8.yml @@ -4,19 +4,17 @@ # https://github.com/voxpupuli/modulesync_config HOSTS: debian-8-x64: - default_apply_opts: - order: random - strict_variables: platform: debian-8-amd64 - hypervisor : docker + hypervisor: docker image: debian:8 docker_preserve_image: true docker_cmd: '["/sbin/init"]' docker_image_commands: - - 'apt-get install -y cron locales-all net-tools wget' + - 'echo deb http://ftp.debian.org/debian jessie-backports main >> /etc/apt/sources.list' + - 'apt-get update && apt-get install -y cron locales-all net-tools wget' - 'rm -f /usr/sbin/policy-rc.d' CONFIG: - type: aio - log_level: debug + trace_limit: 200 + masterless: true ... # vim: syntax=yaml diff --git a/spec/acceptance/nodesets/docker/ubuntu-12.04.yml b/spec/acceptance/nodesets/docker/ubuntu-12.04.yml index e06e7bba..ab77cda4 100644 --- a/spec/acceptance/nodesets/docker/ubuntu-12.04.yml +++ b/spec/acceptance/nodesets/docker/ubuntu-12.04.yml @@ -4,11 +4,8 @@ # https://github.com/voxpupuli/modulesync_config HOSTS: ubuntu-1204-x64: - default_apply_opts: - order: random - strict_variables: platform: ubuntu-12.04-amd64 - hypervisor : docker + hypervisor: docker image: ubuntu:12.04 docker_preserve_image: true docker_cmd: '["/sbin/init"]' @@ -16,7 +13,7 @@ HOSTS: - 'apt-get install -y net-tools wget' - 'locale-gen en_US.UTF-8' CONFIG: - type: aio - log_level: debug + trace_limit: 200 + masterless: true ... # vim: syntax=yaml diff --git a/spec/acceptance/nodesets/docker/ubuntu-14.04.yml b/spec/acceptance/nodesets/docker/ubuntu-14.04.yml index 1849f988..54d5e5a5 100644 --- a/spec/acceptance/nodesets/docker/ubuntu-14.04.yml +++ b/spec/acceptance/nodesets/docker/ubuntu-14.04.yml @@ -4,11 +4,8 @@ # https://github.com/voxpupuli/modulesync_config HOSTS: ubuntu-1404-x64: - default_apply_opts: - order: random - strict_variables: platform: ubuntu-14.04-amd64 - hypervisor : docker + hypervisor: docker image: ubuntu:14.04 docker_preserve_image: true docker_cmd: '["/sbin/init"]' @@ -18,7 +15,7 @@ HOSTS: - 'apt-get install -y net-tools wget' - 'locale-gen en_US.UTF-8' CONFIG: - type: aio - log_level: debug + trace_limit: 200 + masterless: true ... # vim: syntax=yaml diff --git a/spec/acceptance/nodesets/docker/ubuntu-16.04.yml b/spec/acceptance/nodesets/docker/ubuntu-16.04.yml index ac507a65..92a93cb7 100644 --- a/spec/acceptance/nodesets/docker/ubuntu-16.04.yml +++ b/spec/acceptance/nodesets/docker/ubuntu-16.04.yml @@ -4,11 +4,8 @@ # https://github.com/voxpupuli/modulesync_config HOSTS: ubuntu-1604-x64: - default_apply_opts: - order: random - strict_variables: platform: ubuntu-16.04-amd64 - hypervisor : docker + hypervisor: docker image: ubuntu:16.04 docker_preserve_image: true docker_cmd: '["/sbin/init"]' @@ -16,7 +13,7 @@ HOSTS: - 'apt-get install -y net-tools wget' - 'locale-gen en_US.UTF-8' CONFIG: - type: aio - log_level: debug + trace_limit: 200 + masterless: true ... # vim: syntax=yaml diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 42e02543..eab20f45 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -4,7 +4,16 @@ unless RUBY_VERSION =~ %r{^1.9} require 'coveralls' - Coveralls.wear! + require 'simplecov' + require 'simplecov-console' + SimpleCov.formatters = [ + SimpleCov::Formatter::HTMLFormatter, + SimpleCov::Formatter::Console, + Coveralls::SimpleCov::Formatter + ] + SimpleCov.start do + add_filter '/spec' + end end RSpec.configure do |c|