Skip to content

Commit d5ec91e

Browse files
committed
modulesync 2.3.1
1 parent 5fcadf2 commit d5ec91e

21 files changed

+56
-236
lines changed

.editorconfig

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# editorconfig.org
2+
3+
# MANAGED BY MODULESYNC
4+
5+
root = true
6+
7+
[*]
8+
charset = utf-8
9+
end_of_line = lf
10+
indent_size = 2
11+
tab_width = 2
12+
indent_style = space
13+
insert_final_newline = true
14+
trim_trailing_whitespace = true

.github/CONTRIBUTING.md

+15
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,21 @@ To run a specific spec test set the `SPEC` variable:
109109
bundle exec rake spec SPEC=spec/foo_spec.rb
110110
```
111111

112+
### Unit tests in docker
113+
114+
Some people don't want to run the dependencies locally or don't want to install
115+
ruby. We ship a Dockerfile that enables you to run all unit tests and linting.
116+
You only need to run:
117+
118+
```sh
119+
docker build .
120+
```
121+
122+
Please ensure that a docker daemon is running and that your user has the
123+
permission to talk to it. You can specify a remote docker host by setting the
124+
`DOCKER_HOST` environment variable. it will copy the content of the module into
125+
the docker image. So it will not work if a Gemfile.lock exists.
126+
112127
## Integration tests
113128

114129
The unit tests just check the code runs, not that it does exactly what

.msync.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
modulesync_config_version: '2.2.0'
1+
modulesync_config_version: '2.3.1'

.pmtignore

+1
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ Puppetfile.lock
1818
*.iml
1919
.*.sw?
2020
.yardoc/
21+
Dockerfile

Dockerfile

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
FROM ruby:2.5.1
2+
3+
WORKDIR /opt/puppet
4+
5+
# https://github.com/puppetlabs/puppet/blob/06ad255754a38f22fb3a22c7c4f1e2ce453d01cb/lib/puppet/provider/service/runit.rb#L39
6+
RUN mkdir -p /etc/sv
7+
8+
ARG PUPPET_VERSION="~> 6.0"
9+
ARG PARALLEL_TEST_PROCESSORS=4
10+
11+
# Cache gems
12+
COPY Gemfile .
13+
RUN bundle install --without system_tests development release --path=${BUNDLE_PATH:-vendor/bundle}
14+
15+
COPY . .
16+
17+
RUN bundle install
18+
RUN bundle exec release_checks
19+
20+
# Container should not saved
21+
RUN exit 1

Gemfile

+4-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ group :test do
2828
gem 'coveralls', :require => false
2929
gem 'simplecov-console', :require => false
3030
gem 'rack', '~> 1.0', :require => false if RUBY_VERSION < '2.2.2'
31-
gem 'parallel_tests', :require => false
31+
gem 'parallel_tests', '2.24.0', :require => false if RUBY_VERSION < '2.2.0'
32+
gem 'parallel_tests', :require => false if RUBY_VERSION >= '2.2.0'
3233
end
3334

3435
group :development do
@@ -43,15 +44,15 @@ group :system_tests do
4344
if beaker_version = ENV['BEAKER_VERSION']
4445
gem 'beaker', *location_for(beaker_version)
4546
else
46-
gem 'beaker', '>= 3.9.0', :require => false
47+
gem 'beaker', '>= 4.2.0', :require => false
4748
end
4849
if beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
4950
gem 'beaker-rspec', *location_for(beaker_rspec_version)
5051
else
5152
gem 'beaker-rspec', :require => false
5253
end
5354
gem 'serverspec', :require => false
54-
gem 'beaker-hostgenerator', '>= 1.1.10', :require => false
55+
gem 'beaker-hostgenerator', '>= 1.1.22', :require => false
5556
gem 'beaker-docker', :require => false
5657
gem 'beaker-puppet', :require => false
5758
gem 'beaker-puppet_install_helper', :require => false

spec/acceptance/nodesets/centos-511-x64.yml

-15
This file was deleted.

spec/acceptance/nodesets/centos-6-x64.yml

-15
This file was deleted.

spec/acceptance/nodesets/centos-66-x64-pe.yml

-17
This file was deleted.

spec/acceptance/nodesets/centos-66-x64.yml

-15
This file was deleted.

spec/acceptance/nodesets/centos-7-x64.yml

-15
This file was deleted.

spec/acceptance/nodesets/centos-72-x64.yml

-15
This file was deleted.

spec/acceptance/nodesets/debian-78-x64.yml

-15
This file was deleted.

spec/acceptance/nodesets/debian-82-x64.yml

-15
This file was deleted.

spec/acceptance/nodesets/fedora-24-x64.yml

-15
This file was deleted.

spec/acceptance/nodesets/fedora-25-x64.yml

-16
This file was deleted.

spec/acceptance/nodesets/fedora-26-x64.yml

-16
This file was deleted.

spec/acceptance/nodesets/fedora-27-x64.yml

-18
This file was deleted.

spec/acceptance/nodesets/ubuntu-server-1204-x64.yml

-15
This file was deleted.

spec/acceptance/nodesets/ubuntu-server-1404-x64.yml

-15
This file was deleted.

spec/acceptance/nodesets/ubuntu-server-1604-x64.yml

-15
This file was deleted.

0 commit comments

Comments
 (0)