From a208a1c795e7e98aabec3c53caf3114712cc53dd Mon Sep 17 00:00:00 2001 From: TraGicCode <6224270+TraGicCode@users.noreply.github.com> Date: Fri, 23 Mar 2018 20:32:05 -0500 Subject: [PATCH 1/2] modulesync 1.9.0 --- .github/PULL_REQUEST_TEMPLATE.md | 12 ++++++++++++ .msync.yml | 2 +- spec/acceptance/nodesets/docker/ubuntu-16.04.yml | 2 ++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 66f80444c..ef25cdbf4 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.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 +--> diff --git a/.msync.yml b/.msync.yml index 4df90fba4..b49c4c69f 100644 --- a/.msync.yml +++ b/.msync.yml @@ -1 +1 @@ -modulesync_config_version: '1.8.0' +modulesync_config_version: '1.9.0' diff --git a/spec/acceptance/nodesets/docker/ubuntu-16.04.yml b/spec/acceptance/nodesets/docker/ubuntu-16.04.yml index 2d173c5b9..cd6f3762b 100644 --- a/spec/acceptance/nodesets/docker/ubuntu-16.04.yml +++ b/spec/acceptance/nodesets/docker/ubuntu-16.04.yml @@ -10,8 +10,10 @@ HOSTS: docker_preserve_image: true docker_cmd: '["/sbin/init"]' docker_image_commands: + - 'systemctl mask getty@tty1.service getty-static.service' - 'apt-get install -y net-tools wget locales apt-transport-https' - 'locale-gen en_US.UTF-8' + - 'echo LANG=en_US.UTF-8 > /etc/default/locale' CONFIG: trace_limit: 200 masterless: true From d0f6d96f5caee38825dadc6ad5fbbf25d0787b11 Mon Sep 17 00:00:00 2001 From: Tim Meusel <tim@bastelfreak.de> Date: Wed, 11 Apr 2018 12:35:07 +0200 Subject: [PATCH 2/2] modulesync 1.9.0-12-gacb0134 --- .github/CONTRIBUTING.md | 19 +++++++++++++++++-- .msync.yml | 2 +- Gemfile | 2 +- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 7a0980a9e..496a5c034 100644 --- a/.github/CONTRIBUTING.md +++ b/.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 diff --git a/.msync.yml b/.msync.yml index b49c4c69f..964ecbaaa 100644 --- a/.msync.yml +++ b/.msync.yml @@ -1 +1 @@ -modulesync_config_version: '1.9.0' +modulesync_config_version: '1.9.1' diff --git a/Gemfile b/Gemfile index 32e6600eb..91457201f 100644 --- a/Gemfile +++ b/Gemfile @@ -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'