Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

modulesync 2.3.1 #45

Merged
merged 1 commit into from
Dec 5, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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.2.0'
modulesync_config_version: '2.3.1'
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
21 changes: 21 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
FROM ruby:2.5.1

WORKDIR /opt/puppet

# https://github.com/puppetlabs/puppet/blob/06ad255754a38f22fb3a22c7c4f1e2ce453d01cb/lib/puppet/provider/service/runit.rb#L39
RUN mkdir -p /etc/sv

ARG PUPPET_VERSION="~> 6.0"
ARG PARALLEL_TEST_PROCESSORS=4

# Cache gems
COPY Gemfile .
RUN bundle install --without system_tests development release --path=${BUNDLE_PATH:-vendor/bundle}

COPY . .

RUN bundle install
RUN bundle exec release_checks

# Container should not saved
RUN exit 1
7 changes: 4 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.