Skip to content

Commit

Permalink
modulesync 2.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
bastelfreak committed Dec 2, 2018
1 parent 9aea141 commit 13bc18f
Show file tree
Hide file tree
Showing 23 changed files with 45 additions and 252 deletions.
14 changes: 14 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# editorconfig.org

# MANAGED BY MODULESYNC

root = true

[*]
charset = utf-8
end_of_line = lf
indent_size = 2
tab_width = 2
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true
15 changes: 15 additions & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,21 @@ To run a specific spec test set the `SPEC` variable:
bundle exec rake spec SPEC=spec/foo_spec.rb
```

### Unit tests in docker

Some people don't want to run the dependencies locally or don't want to install
ruby. We ship a Dockerfile that enables you to run all unit tests and linting.
You only need to run:

```sh
docker build .
```

Please ensure that a docker daemon is running and that your user has the
permission to talk to it. You can specify a remote docker host by setting the
`DOCKER_HOST` environment variable. it will copy the content of the module into
the docker image. So it will not work if a Gemfile.lock exists.

## Integration tests

The unit tests just check the code runs, not that it does exactly what
Expand Down
2 changes: 1 addition & 1 deletion .msync.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
modulesync_config_version: '2.1.0'
modulesync_config_version: '2.3.0'
1 change: 1 addition & 0 deletions .pmtignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ Puppetfile.lock
*.iml
.*.sw?
.yardoc/
Dockerfile
9 changes: 5 additions & 4 deletions 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', '>= 2.11.0', :require => false
gem 'rspec-puppet-facts', :require => false
gem 'rspec-puppet-facts', '>= 1.8.0', :require => false
gem 'rspec-puppet-utils', :require => false
gem 'puppet-lint-leading_zero-check', :require => false
gem 'puppet-lint-trailing_comma-check', :require => false
Expand All @@ -28,7 +28,8 @@ group :test do
gem 'coveralls', :require => false
gem 'simplecov-console', :require => false
gem 'rack', '~> 1.0', :require => false if RUBY_VERSION < '2.2.2'
gem 'parallel_tests', :require => false
gem 'parallel_tests', '2.24.0', :require => false if RUBY_VERSION < '2.2.0'
gem 'parallel_tests', :require => false if RUBY_VERSION >= '2.2.0'
end

group :development do
Expand All @@ -43,15 +44,15 @@ group :system_tests do
if beaker_version = ENV['BEAKER_VERSION']
gem 'beaker', *location_for(beaker_version)
else
gem 'beaker', '>= 3.9.0', :require => false
gem 'beaker', '>= 4.2.0', :require => false
end
if beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
gem 'beaker-rspec', *location_for(beaker_rspec_version)
else
gem 'beaker-rspec', :require => false
end
gem 'serverspec', :require => false
gem 'beaker-hostgenerator', '>= 1.1.10', :require => false
gem 'beaker-hostgenerator', '>= 1.1.22', :require => false
gem 'beaker-docker', :require => false
gem 'beaker-puppet', :require => false
gem 'beaker-puppet_install_helper', :require => false
Expand Down
15 changes: 0 additions & 15 deletions spec/acceptance/nodesets/centos-511-x64.yml

This file was deleted.

15 changes: 0 additions & 15 deletions spec/acceptance/nodesets/centos-6-x64.yml

This file was deleted.

17 changes: 0 additions & 17 deletions spec/acceptance/nodesets/centos-66-x64-pe.yml

This file was deleted.

15 changes: 0 additions & 15 deletions spec/acceptance/nodesets/centos-66-x64.yml

This file was deleted.

15 changes: 0 additions & 15 deletions spec/acceptance/nodesets/centos-7-x64.yml

This file was deleted.

15 changes: 0 additions & 15 deletions spec/acceptance/nodesets/centos-72-x64.yml

This file was deleted.

15 changes: 0 additions & 15 deletions spec/acceptance/nodesets/debian-78-x64.yml

This file was deleted.

15 changes: 0 additions & 15 deletions spec/acceptance/nodesets/debian-82-x64.yml

This file was deleted.

15 changes: 0 additions & 15 deletions spec/acceptance/nodesets/fedora-24-x64.yml

This file was deleted.

16 changes: 0 additions & 16 deletions spec/acceptance/nodesets/fedora-25-x64.yml

This file was deleted.

16 changes: 0 additions & 16 deletions spec/acceptance/nodesets/fedora-26-x64.yml

This file was deleted.

18 changes: 0 additions & 18 deletions spec/acceptance/nodesets/fedora-27-x64.yml

This file was deleted.

15 changes: 0 additions & 15 deletions spec/acceptance/nodesets/ubuntu-server-1204-x64.yml

This file was deleted.

15 changes: 0 additions & 15 deletions spec/acceptance/nodesets/ubuntu-server-1404-x64.yml

This file was deleted.

15 changes: 0 additions & 15 deletions spec/acceptance/nodesets/ubuntu-server-1604-x64.yml

This file was deleted.

4 changes: 0 additions & 4 deletions spec/classes/coverage_spec.rb

This file was deleted.

1 change: 0 additions & 1 deletion spec/default_facts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
# Hint if using with rspec-puppet-facts ("on_supported_os.each"):
# if a same named fact exists in facterdb it will be overridden.
---
concat_basedir: "/tmp"
ipaddress: "172.16.254.254"
is_pe: false
macaddress: "AA:AA:AA:AA:AA:AA"
19 changes: 9 additions & 10 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
require 'puppetlabs_spec_helper/module_spec_helper'
require 'rspec-puppet-facts'
include RspecPuppetFacts

# This file is managed via modulesync
# https://github.com/voxpupuli/modulesync
# https://github.com/voxpupuli/modulesync_config
require 'puppetlabs_spec_helper/module_spec_helper'
require 'rspec-puppet-facts'
include RspecPuppetFacts

if Dir.exist?(File.expand_path('../../lib', __FILE__))
require 'coveralls'
Expand All @@ -23,13 +22,13 @@
end

RSpec.configure do |c|
default_facts = {
puppetversion: Puppet.version,
facterversion: Facter.version
}
default_facts = {}
default_facts.merge!(YAML.load(File.read(File.expand_path('../default_facts.yml', __FILE__)))) if File.exist?(File.expand_path('../default_facts.yml', __FILE__))
default_facts.merge!(YAML.load(File.read(File.expand_path('../default_module_facts.yml', __FILE__)))) if File.exist?(File.expand_path('../default_module_facts.yml', __FILE__))
c.default_facts = default_facts
end

# vim: syntax=ruby
# Coverage generation
c.after(:suite) do
RSpec::Puppet::Coverage.report!
end
end

0 comments on commit 13bc18f

Please sign in to comment.