diff options
author | Dennis Hoppe <github@debian-solutions.de> | 2017-01-04 20:22:20 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-04 20:22:20 +0100 |
commit | b3d32408cc3a546b4324f6426c788eaa0a832d20 (patch) | |
tree | 5971172aa19dba0c3d3de64c0a6896a223995b7a | |
parent | a08a72c67d133017a5b75a666d6caddee11197c1 (diff) | |
parent | 94d8cd6ac90a4341781e969261562b54c5fe18eb (diff) |
Merge pull request #80 from voxpupuli/modulesync
modulesync 0.16.7
-rw-r--r-- | .msync.yml | 2 | ||||
-rw-r--r-- | .rubocop.yml | 8 | ||||
-rw-r--r-- | .travis.yml | 4 | ||||
-rw-r--r-- | Gemfile | 4 | ||||
-rw-r--r-- | spec/acceptance/nodesets/fedora-24-x64.yml | 15 | ||||
-rw-r--r-- | spec/acceptance/nodesets/fedora-25-x64.yml | 18 | ||||
-rw-r--r-- | spec/default_facts.yml | 9 |
7 files changed, 55 insertions, 5 deletions
@@ -1 +1 @@ -modulesync_config_version: '0.16.6' +modulesync_config_version: '0.16.7' diff --git a/.rubocop.yml b/.rubocop.yml index f703c72..0e28667 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -510,3 +510,11 @@ RSpec/ExampleLength: RSpec/NamedSubject: Enabled: False + +# disabled for now since they cause a lot of issues +# these issues aren't easy to fix +RSpec/RepeatedDescription: + Enabled: False + +RSpec/NestedGroups: + Enabled: False diff --git a/.travis.yml b/.travis.yml index 0c54344..a859583 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,10 +31,10 @@ matrix: env: PUPPET_VERSION="~> 4.0" CHECK=rubocop - rvm: 2.3.3 env: PUPPET_VERSION="~> 4.0" CHECK=test - - rvm: 2.4.0-rc1 + - rvm: 2.4.0 env: PUPPET_VERSION="~> 4.0" CHECK=test allow_failures: - - rvm: 2.4.0-rc1 + - rvm: 2.4.0 branches: only: - master @@ -25,8 +25,8 @@ group :test do gem 'metadata-json-lint', :require => false gem 'puppet-blacksmith', :require => false gem 'voxpupuli-release', :require => false, :git => 'https://github.com/voxpupuli/voxpupuli-release-gem.git' - gem 'puppet-strings', '~> 0.99.0', :require => false - gem 'rubocop-rspec', '~> 1.6', :require => false if RUBY_VERSION >= '2.3.0' + gem 'puppet-strings', '~> 1.0.0', :require => false + gem 'rubocop-rspec', '~> 1.9.0', :require => false if RUBY_VERSION >= '2.3.0' gem 'json_pure', '<= 2.0.1', :require => false if RUBY_VERSION < '2.0.0' gem 'mocha', '>= 1.2.1', :require => false gem 'coveralls', :require => false if RUBY_VERSION >= '2.0.0' diff --git a/spec/acceptance/nodesets/fedora-24-x64.yml b/spec/acceptance/nodesets/fedora-24-x64.yml new file mode 100644 index 0000000..820b62d --- /dev/null +++ b/spec/acceptance/nodesets/fedora-24-x64.yml @@ -0,0 +1,15 @@ +--- +# This file is managed via modulesync +# https://github.com/voxpupuli/modulesync +# https://github.com/voxpupuli/modulesync_config +HOSTS: + fedora-24-x64: + roles: + - master + platform: fedora-24-x86_64 + box: fedora/24-cloud-base + hypervisor: vagrant +CONFIG: + type: aio +... +# vim: syntax=yaml diff --git a/spec/acceptance/nodesets/fedora-25-x64.yml b/spec/acceptance/nodesets/fedora-25-x64.yml new file mode 100644 index 0000000..c3a3cbf --- /dev/null +++ b/spec/acceptance/nodesets/fedora-25-x64.yml @@ -0,0 +1,18 @@ +--- +# This file is managed via modulesync +# https://github.com/voxpupuli/modulesync +# https://github.com/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: + - master + platform: fedora-24-x86_64 + box: fedora/25-cloud-base + hypervisor: vagrant +CONFIG: + type: aio +... +# vim: syntax=yaml diff --git a/spec/default_facts.yml b/spec/default_facts.yml index 4f36506..13c4165 100644 --- a/spec/default_facts.yml +++ b/spec/default_facts.yml @@ -1,3 +1,12 @@ +# This file is managed via modulesync +# https://github.com/voxpupuli/modulesync +# https://github.com/voxpupuli/modulesync_config +# +# use default_module_facts.yaml for module specific +# facts. +# +# Hint if using with rspec-puppet-facts ("on_supported_os.each"): +# if a same named fact exists in facterdb it will be overridden. --- concat_basedir: "/tmp" ipaddress: "172.16.254.254" |