Skip to content

Commit

Permalink
modulesync 0.15.0
Browse files Browse the repository at this point in the history
  • Loading branch information
bastelfreak committed Nov 2, 2016
1 parent ad5be25 commit 3d2c570
Show file tree
Hide file tree
Showing 13 changed files with 47 additions and 58 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ log/
.idea/
*.iml
.*.sw
.yardoc/
2 changes: 1 addition & 1 deletion .msync.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
modulesync_config_version: '0.14.1'
modulesync_config_version: '0.15.0'
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
13 changes: 5 additions & 8 deletions spec/acceptance/nodesets/docker/centos-5.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
11 changes: 4 additions & 7 deletions spec/acceptance/nodesets/docker/centos-6.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
11 changes: 4 additions & 7 deletions spec/acceptance/nodesets/docker/centos-7.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
12 changes: 5 additions & 7 deletions spec/acceptance/nodesets/docker/debian-7.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
12 changes: 5 additions & 7 deletions spec/acceptance/nodesets/docker/debian-8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 3 additions & 6 deletions spec/acceptance/nodesets/docker/ubuntu-12.04.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,16 @@
# 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"]'
docker_image_commands:
- '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
9 changes: 3 additions & 6 deletions spec/acceptance/nodesets/docker/ubuntu-14.04.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]'
Expand All @@ -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
9 changes: 3 additions & 6 deletions spec/acceptance/nodesets/docker/ubuntu-16.04.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,16 @@
# 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"]'
docker_image_commands:
- '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
11 changes: 10 additions & 1 deletion spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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|
Expand Down

0 comments on commit 3d2c570

Please sign in to comment.