Rely on beaker-hostgenerator for docker nodesets

.github/CONTRIBUTING.md

@@ -40,9 +40,24 @@ you must set an environment variable such as:
 
  export PUPPET_VERSION="~> 4.2.0"
 
-Install the dependencies like so...
+You can install all needed gems for spec tests into the modules directory by
+running:
 
- bundle install
+```sh
+bundle install --path .vendor/ --without development --without system_tests --without release
+```
+
+If you also want to run acceptance tests:
+
+```sh
+bundle install --path .vendor/ --without development --with system_tests --without release
+```
+
+Our all in one solution if you don't know if you need to install or update gems:
+
+```sh
+bundle install --path .vendor/ --without development --with system_tests --without release; bundle update; bundle clean
+```
 
 ## Syntax and style
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -6,3 +6,15 @@ Thank you for contributing to this project!
 - Our vulnerabilities reporting process is at https://voxpupuli.org/security/
 
 -->
+#### Pull Request (PR) description
+<!--
+ Replace this comment with a description of your pull request.
+-->
+
+#### This Pull Request (PR) fixes the following issues
+<!--
+ Replace this comment with the list of issues or n/a.
+ Use format:
+ Fixes #123
+ Fixes #124
+-->

.msync.yml

@@ -1 +1 @@
-modulesync_config_version: '1.6.0'
+modulesync_config_version: '1.9.2'

.sync.yml

@@ -2,6 +2,6 @@
 .travis.yml:
  secure: "SCQpiBB9qpZAjBRk+b9D3cSCQfYpDgHPOdOc7djfGeB5yn1UbGg7uW1zshrshb4QMLfUgvsL4LsT0CYj7ilBerghgeySF5JWuZdk05W/7Iudls4btbxdVjqtALR7p02mnk40qHTR1Tdb/j0gXW9uigU6nQU9iCP+Poa1KF6PXpk="
  docker_sets:
- - set: docker/ubuntu-14.04
- - set: docker/centos-7
- - set: docker/debian-8
+ - set: ubuntu1404-64
+ - set: centos7-64
+ - set: debian8-64

.travis.yml

@@ -3,41 +3,47 @@ sudo: false
 dist: trusty
 language: ruby
 cache: bundler
+# related to https:/rubygems/rubygems/issues/2123
 before_install:
- - rm -f Gemfile.lock
+ - 'rm -f Gemfile.lock'
+ - 'gem update --system'
+ - 'gem install bundler'
 script:
  - 'bundle exec rake $CHECK'
 matrix:
  fast_finish: true
  include:
  - rvm: 2.1.9
  bundler_args: --without system_tests development release
- env: PUPPET_VERSION="~> 4.0" CHECK=test PARALLEL_TEST_PROCESSORS=16
- - rvm: 2.4.2
+ env: PUPPET_VERSION="~> 4.0" CHECK=test PARALLEL_TEST_PROCESSORS=12
+ - rvm: 2.4.4
+ bundler_args: --without system_tests development release
+ env: PUPPET_VERSION="~> 5.0" CHECK=test
+ - rvm: 2.5.1
  bundler_args: --without system_tests development release
  env: PUPPET_VERSION="~> 5.0" CHECK=test_with_coveralls
- - rvm: 2.4.2
+ - rvm: 2.4.4
  bundler_args: --without system_tests development release
  env: PUPPET_VERSION="~> 5.0" CHECK=rubocop
- - rvm: 2.4.2
+ - rvm: 2.5.1
  bundler_args: --without system_tests development release
  env: PUPPET_VERSION="~> 5.0" CHECK=build DEPLOY_TO_FORGE=yes
- - rvm: 2.4.2
+ - rvm: 2.5.1
  bundler_args: --without development release
  dist: trusty
- env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04 CHECK=beaker
+ env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_setfile=ubuntu1404-64{hypervisor=docker} CHECK=beaker
  services: docker
  sudo: required
- - rvm: 2.4.2
+ - rvm: 2.5.1
  bundler_args: --without development release
  dist: trusty
- env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/centos-7 CHECK=beaker
+ env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_setfile=centos7-64{hypervisor=docker} CHECK=beaker
  services: docker
  sudo: required
- - rvm: 2.4.2
+ - rvm: 2.5.1
  bundler_args: --without development release
  dist: trusty
- env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/debian-8 CHECK=beaker
+ env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_setfile=debian8-64{hypervisor=docker} CHECK=beaker
  services: docker
  sudo: required
 branches:

Gemfile

@@ -11,7 +11,7 @@ def location_for(place, fake_version = nil)
 end
 
 group :test do
- gem 'puppetlabs_spec_helper', '~> 2.5.0', :require => false
+ gem 'puppetlabs_spec_helper', '~> 2.6.0', :require => false
  gem 'rspec-puppet', '~> 2.5', :require => false
  gem 'rspec-puppet-facts', :require => false
  gem 'rspec-puppet-utils', :require => false
@@ -25,7 +25,7 @@ group :test do
  gem 'redcarpet', :require => false
  gem 'rubocop', '~> 0.49.1', :require => false if RUBY_VERSION >= '2.3.0'
  gem 'rubocop-rspec', '~> 1.15.0', :require => false if RUBY_VERSION >= '2.3.0'
- gem 'mocha', '>= 1.2.1', :require => false
+ gem 'mocha', '~> 1.4.0', :require => false
  gem 'coveralls', :require => false
  gem 'simplecov-console', :require => false
  gem 'rack', '~> 1.0', :require => false if RUBY_VERSION < '2.2.2'
@@ -40,7 +40,7 @@ group :development do
 end
 
 group :system_tests do
- gem 'winrm', :require => false
+ gem 'winrm',  :require => false
  if beaker_version = ENV['BEAKER_VERSION']
  gem 'beaker', *location_for(beaker_version)
  else
@@ -51,13 +51,14 @@ group :system_tests do
  else
  gem 'beaker-rspec', :require => false
  end
- gem 'serverspec', :require => false
- gem 'beaker-puppet_install_helper', :require => false
- gem 'beaker-module_install_helper', :require => false
+ gem 'serverspec', :require => false
+ gem 'beaker-hostgenerator', '>= 1.1.10', :require => false
+ gem 'beaker-puppet_install_helper', :require => false
+ gem 'beaker-module_install_helper', :require => false
 end
 
 group :release do
- gem 'github_changelog_generator', :require => false, :git => 'https:/skywinder/github-changelog-generator'
+ gem 'github_changelog_generator', :require => false, :git => 'https:/skywinder/github-changelog-generator' if RUBY_VERSION >= '2.2.2'
  gem 'puppet-blacksmith', :require => false
  gem 'voxpupuli-release', :require => false, :git => 'https:/voxpupuli/voxpupuli-release-gem'
  gem 'puppet-strings', '~> 1.0', :require => false

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

@@ -3,8 +3,6 @@
 # https:/voxpupuli/modulesync
 # https:/voxpupuli/modulesync_config
 #
-# platform is fedora 24 because there is no
-# puppet-agent for fedora 25 by 2016-12-30
 HOSTS:
  fedora-25-x64:
  roles:

spec/default_facts.yml

@@ -12,4 +12,3 @@ concat_basedir: "/tmp"
 ipaddress: "172.16.254.254"
 is_pe: false
 macaddress: "AA:AA:AA:AA:AA:AA"
-root_home: /root

spec/spec_helper.rb

@@ -2,6 +2,10 @@
 require 'rspec-puppet-facts'
 include RspecPuppetFacts
 
+# This file is managed via modulesync
+# https:/voxpupuli/modulesync
+# https:/voxpupuli/modulesync_config
+
 if Dir.exist?(File.expand_path('../../lib', __FILE__))
  require 'coveralls'
  require 'simplecov'