Skip to content

Commit 6947c26

Browse files
bastelfreakbastelfreak
committed
modulesync 2.12.0
1 parent ce6cf05 commit 6947c26

8 files changed

Lines changed: 29 additions & 128 deletions

File tree

‎.github/CONTRIBUTING.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,18 +256,20 @@ Beaker also supports docker containers. We also use that in our automated CI
256256
pipeline at [travis-ci](http://travis-ci.org). To use that instead of Vagrant:
257257

258258
```sh
259-
PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=debian9-64{hypervisor=docker} BEAKER_destroy=yes bundle exec rake beaker
259+
PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=debian10-64{hypervisor=docker} BEAKER_destroy=yes bundle exec rake beaker
260260
```
261261

262-
You can replace the string `debian9` with any common operating system.
262+
You can replace the string `debian10` with any common operating system.
263263
The following strings are known to work:
264264

265265
* ubuntu1604
266266
* ubuntu1804
267267
* debian8
268268
* debian9
269+
* debian10
269270
* centos6
270271
* centos7
272+
* centos8
271273

272274
The easiest way to debug in a docker container is to open a shell:
273275

‎.msync.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
modulesync_config_version: '2.10.0'
1+
modulesync_config_version: '2.12.0'

‎.rubocop.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
require: rubocop-rspec
22
AllCops:
3-
TargetRubyVersion: 2.1
3+
# Puppet Server 5 defaults to jruby 1.7 so TargetRubyVersion must stay at 1.9 until we drop support for puppet 5
4+
TargetRubyVersion: 1.9
45
Include:
56
- ./**/*.rb
67
Exclude:

‎.sync.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,4 @@
1919
- set: debian9-64
2020
options:
2121
script: 'bundle exec rspec spec/acceptance/php_spec.rb'
22-
- set: debian8-64
23-
options:
24-
script: 'bundle exec rspec spec/acceptance/php_spec.rb'
2522
secure: "GOhttACuJt+3s38m4WnW5RuTgwqaAoeEQnNT+X1Ukn7KdcIk4KV8NzYU/CC0VIm8lUOnBWYJKEC4ixX/J/4Wbxox2RAoKMQrO++L0DB1zTCJnq9SfoUBMaQhXvLu+PbxAR0p3P47ozra0C+pOWDpOaxT9ecufrPQt9W9Z4aY/bs="

‎.travis.yml‎

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -34,62 +34,54 @@ matrix:
3434
services: docker
3535
- rvm: 2.5.3
3636
bundler_args: --without development release
37-
env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=ubuntu1604-64 BEAKER_HYPERVISOR=docker CHECK=beaker
38-
script: bundle exec rspec spec/acceptance/php56_spec.rb
39-
services: docker
40-
- rvm: 2.5.3
41-
bundler_args: --without development release
42-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=ubuntu1804-64 BEAKER_HYPERVISOR=docker CHECK=beaker
37+
env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=centos7-64 BEAKER_HYPERVISOR=docker CHECK=beaker
4338
script: bundle exec rspec spec/acceptance/php56_spec.rb
4439
services: docker
4540
- rvm: 2.5.3
4641
bundler_args: --without development release
47-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=ubuntu1804-64 BEAKER_HYPERVISOR=docker CHECK=beaker
42+
env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=centos7-64 BEAKER_HYPERVISOR=docker CHECK=beaker
4843
script: bundle exec rspec spec/acceptance/php56_spec.rb
4944
services: docker
5045
- rvm: 2.5.3
5146
bundler_args: --without development release
52-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=ubuntu1804-64 BEAKER_HYPERVISOR=docker CHECK=beaker
53-
script: bundle exec rspec spec/acceptance/php56_spec.rb
47+
env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=ubuntu1804-64 BEAKER_HYPERVISOR=docker CHECK=beaker
48+
script: bundle exec rspec spec/acceptance/php_spec.rb
5449
services: docker
5550
- rvm: 2.5.3
5651
bundler_args: --without development release
57-
env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=centos7-64 BEAKER_HYPERVISOR=docker CHECK=beaker
58-
script: bundle exec rspec spec/acceptance/php56_spec.rb
52+
env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=ubuntu1804-64 BEAKER_HYPERVISOR=docker CHECK=beaker
53+
script: bundle exec rspec spec/acceptance/php_spec.rb
5954
services: docker
6055
- rvm: 2.5.3
6156
bundler_args: --without development release
62-
env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=centos7-64 BEAKER_HYPERVISOR=docker CHECK=beaker
63-
script: bundle exec rspec spec/acceptance/php56_spec.rb
57+
env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=ubuntu1604-64 BEAKER_HYPERVISOR=docker CHECK=beaker
58+
script: bundle exec rspec spec/acceptance/php_spec.rb
6459
services: docker
6560
- rvm: 2.5.3
6661
bundler_args: --without development release
67-
env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=ubuntu1804-64 BEAKER_HYPERVISOR=docker CHECK=beaker
62+
env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=ubuntu1604-64 BEAKER_HYPERVISOR=docker CHECK=beaker
6863
script: bundle exec rspec spec/acceptance/php_spec.rb
6964
services: docker
7065
- rvm: 2.5.3
7166
bundler_args: --without development release
72-
env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=ubuntu1804-64 BEAKER_HYPERVISOR=docker CHECK=beaker
67+
env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=centos7-64 BEAKER_HYPERVISOR=docker CHECK=beaker
7368
script: bundle exec rspec spec/acceptance/php_spec.rb
7469
services: docker
7570
- rvm: 2.5.3
7671
bundler_args: --without development release
77-
env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=ubuntu1604-64 BEAKER_HYPERVISOR=docker CHECK=beaker
72+
env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=centos7-64 BEAKER_HYPERVISOR=docker CHECK=beaker
7873
script: bundle exec rspec spec/acceptance/php_spec.rb
7974
services: docker
8075
- rvm: 2.5.3
8176
bundler_args: --without development release
82-
env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=ubuntu1604-64 BEAKER_HYPERVISOR=docker CHECK=beaker
77+
env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=debian9-64 BEAKER_HYPERVISOR=docker CHECK=beaker
8378
script: bundle exec rspec spec/acceptance/php_spec.rb
8479
services: docker
8580
- rvm: 2.5.3
8681
bundler_args: --without development release
87-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=ubuntu1404-64 BEAKER_HYPERVISOR=docker CHECK=beaker
82+
env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=debian9-64 BEAKER_HYPERVISOR=docker CHECK=beaker
8883
script: bundle exec rspec spec/acceptance/php_spec.rb
8984
services: docker
90-
- rvm: 2.5.3
91-
bundler_args: --without development release
92-
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=ubuntu1404-64 BEAKER_HYPERVISOR=docker CHECK=beaker
9385
branches:
9486
only:
9587
- master

‎Gemfile‎

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,9 @@ def location_for(place, fake_version = nil)
1111
end
1212

1313
group :test do
14-
gem 'puppetlabs_spec_helper', '>= 2.14.0', :require => false
15-
gem 'rspec-puppet-facts', '>= 1.9.5', :require => false
16-
gem 'rspec-puppet-utils', :require => false
17-
gem 'puppet-lint-leading_zero-check', :require => false
18-
gem 'puppet-lint-trailing_comma-check', :require => false
19-
gem 'puppet-lint-version_comparison-check', :require => false
20-
gem 'puppet-lint-classes_and_types_beginning_with_digits-check', :require => false
21-
gem 'puppet-lint-unquoted_string-check', :require => false
22-
gem 'puppet-lint-variable_contains_upcase', :require => false
23-
gem 'puppet-lint-absolute_classname-check', '>= 2.0.0', :require => false
24-
gem 'puppet-lint-topscope-variable-check', :require => false
25-
gem 'puppet-lint-legacy_facts-check', :require => false
26-
gem 'puppet-lint-anchor-check', :require => false
27-
gem 'metadata-json-lint', :require => false
28-
gem 'redcarpet', :require => false
29-
gem 'rubocop', '~> 0.49.1', :require => false
30-
gem 'rubocop-rspec', '~> 1.15.0', :require => false
31-
gem 'mocha', '~> 1.4.0', :require => false
32-
gem 'coveralls', :require => false
33-
gem 'simplecov-console', :require => false
34-
gem 'parallel_tests', :require => false
14+
gem 'voxpupuli-test', '>= 1.0.0', :require => false
15+
gem 'coveralls', :require => false
16+
gem 'simplecov-console', :require => false
3517
end
3618

3719
group :development do
@@ -62,6 +44,7 @@ group :system_tests do
6244
gem 'rbnacl', '>= 4', :require => false
6345
gem 'rbnacl-libsodium', :require => false
6446
gem 'bcrypt_pbkdf', :require => false
47+
gem 'ed25519', :require => false
6548
end
6649

6750
group :release do

‎Rakefile‎

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require 'puppetlabs_spec_helper/rake_tasks'
1+
require 'voxpupuli/test/rake'
22

33
# load optional tasks for releases
44
# only available if gem group releases is installed
@@ -7,37 +7,6 @@ begin
77
rescue LoadError
88
end
99

10-
PuppetLint.configuration.log_format = '%{path}:%{line}:%{check}:%{KIND}:%{message}'
11-
12-
desc 'Auto-correct puppet-lint offenses'
13-
task 'lint:auto_correct' do
14-
Rake::Task[:lint_fix].invoke
15-
end
16-
17-
desc 'Run acceptance tests'
18-
RSpec::Core::RakeTask.new(:acceptance) do |t|
19-
t.pattern = 'spec/acceptance'
20-
end
21-
22-
desc 'Run tests'
23-
task test: [:release_checks]
24-
25-
namespace :check do
26-
desc 'Check for trailing whitespace'
27-
task :trailing_whitespace do
28-
Dir.glob('**/*.md', File::FNM_DOTMATCH).sort.each do |filename|
29-
next if filename =~ %r{^((modules|acceptance|\.?vendor|spec/fixtures|pkg)/|REFERENCE.md)}
30-
File.foreach(filename).each_with_index do |line, index|
31-
if line =~ %r{\s\n$}
32-
puts "#{filename} has trailing whitespace on line #{index + 1}"
33-
exit 1
34-
end
35-
end
36-
end
37-
end
38-
end
39-
Rake::Task[:release_checks].enhance ['check:trailing_whitespace']
40-
4110
desc "Run main 'test' task and report merged results to coveralls"
4211
task test_with_coveralls: [:test] do
4312
if Dir.exist?(File.expand_path('../lib', __FILE__))

‎spec/spec_helper.rb‎

Lines changed: 4 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,12 @@
11
# This file is managed via modulesync
22
# https://github.com/voxpupuli/modulesync
33
# https://github.com/voxpupuli/modulesync_config
4-
RSpec.configure do |c|
5-
c.mock_with :rspec
6-
end
74

8-
require 'puppetlabs_spec_helper/module_spec_helper'
9-
require 'rspec-puppet-facts'
10-
require 'bundler'
11-
include RspecPuppetFacts
5+
# puppetlabs_spec_helper will set up coverage if the env variable is set.
6+
# We want to do this if lib exists and it hasn't been explicitly set.
7+
ENV['COVERAGE'] ||= 'yes' if Dir.exist?(File.expand_path('../../lib', __FILE__))
128

13-
if ENV['DEBUG']
14-
Puppet::Util::Log.level = :debug
15-
Puppet::Util::Log.newdestination(:console)
16-
end
9+
require 'voxpupuli/test/spec_helper'
1710

1811
if File.exist?(File.join(__dir__, 'default_module_facts.yml'))
1912
facts = YAML.load(File.read(File.join(__dir__, 'default_module_facts.yml')))
@@ -23,39 +16,3 @@
2316
end
2417
end
2518
end
26-
27-
if Dir.exist?(File.expand_path('../../lib', __FILE__))
28-
require 'coveralls'
29-
require 'simplecov'
30-
require 'simplecov-console'
31-
SimpleCov.formatters = [
32-
SimpleCov::Formatter::HTMLFormatter,
33-
SimpleCov::Formatter::Console
34-
]
35-
SimpleCov.start do
36-
track_files 'lib/**/*.rb'
37-
add_filter '/spec'
38-
add_filter '/vendor'
39-
add_filter '/.vendor'
40-
add_filter Bundler.configured_bundle_path.path
41-
end
42-
end
43-
44-
RSpec.configure do |c|
45-
# getting the correct facter version is tricky. We use facterdb as a source to mock facts
46-
# see https://github.com/camptocamp/facterdb
47-
# people might provide a specific facter version. In that case we use it.
48-
# Otherwise we need to match the correct facter version to the used puppet version.
49-
# as of 2019-10-31, puppet 5 ships facter 3.11 and puppet 6 ships facter 3.14
50-
# https://puppet.com/docs/puppet/5.5/about_agent.html
51-
c.default_facter_version = if ENV['FACTERDB_FACTS_VERSION']
52-
ENV['FACTERDB_FACTS_VERSION']
53-
else
54-
Gem::Dependency.new('', ENV['PUPPET_VERSION']).match?('', '5') ? '3.11.0' : '3.14.0'
55-
end
56-
57-
# Coverage generation
58-
c.after(:suite) do
59-
RSpec::Puppet::Coverage.report!
60-
end
61-
end

0 commit comments

Comments
 (0)