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 0.21.3 #672

Merged
merged 4 commits into from May 27, 2017
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
1 change: 0 additions & 1 deletion .fixtures.yml
Expand Up @@ -6,7 +6,6 @@ fixtures:
repo: 'git://github.com/puppetlabs/puppetlabs-stdlib'
concat:
repo: 'git://github.com/puppetlabs/puppetlabs-concat'
ref: '2.1.0'
epel:
repo: 'https://github.com/stahnma/puppet-module-epel'
symlinks:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -17,3 +17,4 @@ Puppetfile.lock
*.iml
.*.sw?
.yardoc/
Guardfile
2 changes: 1 addition & 1 deletion .msync.yml
@@ -1 +1 @@
modulesync_config_version: '0.21.0'
modulesync_config_version: '0.21.3'
1 change: 1 addition & 0 deletions .rspec_parallel
@@ -0,0 +1 @@
--format progress
6 changes: 6 additions & 0 deletions .rubocop.yml
Expand Up @@ -11,6 +11,7 @@ AllCops:
- spec/fixtures/**/*
- Gemfile
- Rakefile
- Guardfile
Lint/ConditionPosition:
Enabled: True

Expand Down Expand Up @@ -502,6 +503,10 @@ Style/ClosingParenthesisIndentation:

# RSpec

RSpec/BeforeAfterAll:
Exclude:
- spec/acceptance/**/*

# We don't use rspec in this way
RSpec/DescribeClass:
Enabled: False
Expand All @@ -524,6 +529,7 @@ RSpec/NestedGroups:
# this is broken on ruby1.9
Style/IndentHeredoc:
Enabled: False

# disable Yaml safe_load. This is needed to support ruby2.0.0 development envs
Security/YAMLLoad:
Enabled: false
1 change: 1 addition & 0 deletions Gemfile
Expand Up @@ -35,6 +35,7 @@ group :test do
gem 'github_changelog_generator', '~> 1.13.0', :require => false if RUBY_VERSION < '2.2.2'
gem 'rack', '~> 1.0', :require => false if RUBY_VERSION < '2.2.2'
gem 'github_changelog_generator', :require => false if RUBY_VERSION >= '2.2.2'
gem 'parallel_tests', :require => false
end

group :development do
Expand Down
13 changes: 13 additions & 0 deletions spec/acceptance/nodesets/archlinux-2-x64.yml
@@ -0,0 +1,13 @@
---
# This file is managed via modulesync
# https://github.com/voxpupuli/modulesync
# https://github.com/voxpupuli/modulesync_config
HOSTS:
archlinux-2-x64:
roles:
- master
platform: archlinux-2-x64
box: archlinux/archlinux
hypervisor: vagrant
CONFIG:
type: foss
3 changes: 0 additions & 3 deletions spec/default_module_facts.yml
@@ -1,6 +1,3 @@
---
collectd_version: '5.5.0'
python_dir: '/usr/local/lib/python2.7/dist-packages'
operatingsystem: 'Debian'
lsbdistid: 'Debian'
lsbdistcodename: 'wheezy'
2 changes: 1 addition & 1 deletion spec/spec_helper_methods.rb
@@ -1,5 +1,5 @@
def os_specific_options(facts)
case facts[:osfamily]
case facts[:os]['family']
when 'Gentoo'
{ package: 'app-admin/collectd', service: 'collectd', plugin_conf_dir: '/etc/collectd.d' }
when 'Solaris'
Expand Down