mirror of
https://github.com/philippdieter/puppet-ldapquery.git
synced 2025-10-13 12:55:48 +00:00
Merge pull request #13 from xaque208/modulesync
Update from xaque208 modulesync_config
This commit is contained in:
Zach Leslie
GitHub
commit
5f715d32d4
2
.gitignore
vendored
2
.gitignore
vendored
@ -7,6 +7,7 @@ spec/fixtures/manifests/
|
||||
spec/fixtures/modules/
|
||||
.vagrant/
|
||||
.bundle/
|
||||
.ruby-version
|
||||
coverage/
|
||||
log/
|
||||
.idea/
|
||||
@ -16,3 +17,4 @@ Puppetfile.lock
|
||||
*.iml
|
||||
.*.sw?
|
||||
.yardoc/
|
||||
Guardfile
|
||||
|
||||
@ -1 +1 @@
|
||||
modulesync_config_version: '0.19.3'
|
||||
modulesync_config_version: '1.9.3-rc0'
|
||||
|
||||
19
.pmtignore
19
.pmtignore
@ -1 +1,20 @@
|
||||
docs/
|
||||
pkg/
|
||||
Gemfile.lock
|
||||
Gemfile.local
|
||||
vendor/
|
||||
.vendor/
|
||||
spec/fixtures/manifests/
|
||||
spec/fixtures/modules/
|
||||
.vagrant/
|
||||
.bundle/
|
||||
.ruby-version
|
||||
coverage/
|
||||
log/
|
||||
.idea/
|
||||
.dependencies/
|
||||
.librarian/
|
||||
Puppetfile.lock
|
||||
*.iml
|
||||
.*.sw?
|
||||
.yardoc/
|
||||
|
||||
1
.rspec_parallel
Normal file
1
.rspec_parallel
Normal file
@ -0,0 +1 @@
|
||||
--format progress
|
||||
99
.rubocop.yml
99
.rubocop.yml
@ -9,6 +9,10 @@ AllCops:
|
||||
- .vendor/**/*
|
||||
- pkg/**/*
|
||||
- spec/fixtures/**/*
|
||||
- Gemfile
|
||||
- Rakefile
|
||||
- Guardfile
|
||||
- Vagrantfile
|
||||
Lint/ConditionPosition:
|
||||
Enabled: True
|
||||
|
||||
@ -42,13 +46,16 @@ Style/HashSyntax:
|
||||
Style/RedundantReturn:
|
||||
Enabled: True
|
||||
|
||||
Layout/EndOfLine:
|
||||
Enabled: False
|
||||
|
||||
Lint/AmbiguousOperator:
|
||||
Enabled: True
|
||||
|
||||
Lint/AssignmentInCondition:
|
||||
Enabled: True
|
||||
|
||||
Style/SpaceBeforeComment:
|
||||
Layout/SpaceBeforeComment:
|
||||
Enabled: True
|
||||
|
||||
Style/AndOr:
|
||||
@ -116,7 +123,7 @@ Lint/UselessAssignment:
|
||||
Lint/Void:
|
||||
Enabled: True
|
||||
|
||||
Style/AccessModifierIndentation:
|
||||
Layout/AccessModifierIndentation:
|
||||
Enabled: True
|
||||
|
||||
Style/AccessorMethodName:
|
||||
@ -125,13 +132,13 @@ Style/AccessorMethodName:
|
||||
Style/Alias:
|
||||
Enabled: True
|
||||
|
||||
Style/AlignArray:
|
||||
Layout/AlignArray:
|
||||
Enabled: True
|
||||
|
||||
Style/AlignHash:
|
||||
Layout/AlignHash:
|
||||
Enabled: True
|
||||
|
||||
Style/AlignParameters:
|
||||
Layout/AlignParameters:
|
||||
Enabled: True
|
||||
|
||||
Metrics/BlockNesting:
|
||||
@ -149,7 +156,7 @@ Style/BracesAroundHashParameters:
|
||||
Style/CaseEquality:
|
||||
Enabled: True
|
||||
|
||||
Style/CaseIndentation:
|
||||
Layout/CaseIndentation:
|
||||
Enabled: True
|
||||
|
||||
Style/CharacterLiteral:
|
||||
@ -183,64 +190,64 @@ Style/WordArray:
|
||||
Style/UnneededPercentQ:
|
||||
Enabled: True
|
||||
|
||||
Style/Tab:
|
||||
Layout/Tab:
|
||||
Enabled: True
|
||||
|
||||
Style/SpaceBeforeSemicolon:
|
||||
Layout/SpaceBeforeSemicolon:
|
||||
Enabled: True
|
||||
|
||||
Style/TrailingBlankLines:
|
||||
Layout/TrailingBlankLines:
|
||||
Enabled: True
|
||||
|
||||
Style/SpaceInsideBlockBraces:
|
||||
Layout/SpaceInsideBlockBraces:
|
||||
Enabled: True
|
||||
|
||||
Style/SpaceInsideBrackets:
|
||||
Layout/SpaceInsideBrackets:
|
||||
Enabled: True
|
||||
|
||||
Style/SpaceInsideHashLiteralBraces:
|
||||
Layout/SpaceInsideHashLiteralBraces:
|
||||
Enabled: True
|
||||
|
||||
Style/SpaceInsideParens:
|
||||
Layout/SpaceInsideParens:
|
||||
Enabled: True
|
||||
|
||||
Style/LeadingCommentSpace:
|
||||
Layout/LeadingCommentSpace:
|
||||
Enabled: True
|
||||
|
||||
Style/SpaceBeforeFirstArg:
|
||||
Layout/SpaceBeforeFirstArg:
|
||||
Enabled: True
|
||||
|
||||
Style/SpaceAfterColon:
|
||||
Layout/SpaceAfterColon:
|
||||
Enabled: True
|
||||
|
||||
Style/SpaceAfterComma:
|
||||
Layout/SpaceAfterComma:
|
||||
Enabled: True
|
||||
|
||||
Style/SpaceAfterMethodName:
|
||||
Layout/SpaceAfterMethodName:
|
||||
Enabled: True
|
||||
|
||||
Style/SpaceAfterNot:
|
||||
Layout/SpaceAfterNot:
|
||||
Enabled: True
|
||||
|
||||
Style/SpaceAfterSemicolon:
|
||||
Layout/SpaceAfterSemicolon:
|
||||
Enabled: True
|
||||
|
||||
Style/SpaceAroundEqualsInParameterDefault:
|
||||
Layout/SpaceAroundEqualsInParameterDefault:
|
||||
Enabled: True
|
||||
|
||||
Style/SpaceAroundOperators:
|
||||
Layout/SpaceAroundOperators:
|
||||
Enabled: True
|
||||
|
||||
Style/SpaceBeforeBlockBraces:
|
||||
Layout/SpaceBeforeBlockBraces:
|
||||
Enabled: True
|
||||
|
||||
Style/SpaceBeforeComma:
|
||||
Layout/SpaceBeforeComma:
|
||||
Enabled: True
|
||||
|
||||
Style/CollectionMethods:
|
||||
Enabled: True
|
||||
|
||||
Style/CommentIndentation:
|
||||
Layout/CommentIndentation:
|
||||
Enabled: True
|
||||
|
||||
Style/ColonMethodCall:
|
||||
@ -265,7 +272,7 @@ Style/DefWithParentheses:
|
||||
Style/PreferredHashMethods:
|
||||
Enabled: True
|
||||
|
||||
Style/DotPosition:
|
||||
Layout/DotPosition:
|
||||
EnforcedStyle: trailing
|
||||
|
||||
Style/DoubleNegation:
|
||||
@ -274,25 +281,25 @@ Style/DoubleNegation:
|
||||
Style/EachWithObject:
|
||||
Enabled: True
|
||||
|
||||
Style/EmptyLineBetweenDefs:
|
||||
Layout/EmptyLineBetweenDefs:
|
||||
Enabled: True
|
||||
|
||||
Style/IndentArray:
|
||||
Layout/IndentArray:
|
||||
Enabled: True
|
||||
|
||||
Style/IndentHash:
|
||||
Layout/IndentHash:
|
||||
Enabled: True
|
||||
|
||||
Style/IndentationConsistency:
|
||||
Layout/IndentationConsistency:
|
||||
Enabled: True
|
||||
|
||||
Style/IndentationWidth:
|
||||
Layout/IndentationWidth:
|
||||
Enabled: True
|
||||
|
||||
Style/EmptyLines:
|
||||
Layout/EmptyLines:
|
||||
Enabled: True
|
||||
|
||||
Style/EmptyLinesAroundAccessModifier:
|
||||
Layout/EmptyLinesAroundAccessModifier:
|
||||
Enabled: True
|
||||
|
||||
Style/EmptyLiteral:
|
||||
@ -311,7 +318,7 @@ Style/MethodDefParentheses:
|
||||
Style/LineEndConcatenation:
|
||||
Enabled: True
|
||||
|
||||
Style/TrailingWhitespace:
|
||||
Layout/TrailingWhitespace:
|
||||
Enabled: True
|
||||
|
||||
Style/StringLiterals:
|
||||
@ -463,9 +470,6 @@ Metrics/ParameterLists:
|
||||
Lint/RequireParentheses:
|
||||
Enabled: True
|
||||
|
||||
Style/SpaceBeforeFirstArg:
|
||||
Enabled: True
|
||||
|
||||
Style/ModuleFunction:
|
||||
Enabled: True
|
||||
|
||||
@ -481,7 +485,7 @@ Style/Encoding:
|
||||
Style/BlockDelimiters:
|
||||
Enabled: True
|
||||
|
||||
Style/MultilineBlockLayout:
|
||||
Layout/MultilineBlockLayout:
|
||||
Enabled: True
|
||||
|
||||
# 'Complexity' is very relative
|
||||
@ -495,11 +499,15 @@ Metrics/PerceivedComplexity:
|
||||
Lint/UselessAssignment:
|
||||
Enabled: True
|
||||
|
||||
Style/ClosingParenthesisIndentation:
|
||||
Layout/ClosingParenthesisIndentation:
|
||||
Enabled: True
|
||||
|
||||
# RSpec
|
||||
|
||||
RSpec/BeforeAfterAll:
|
||||
Exclude:
|
||||
- spec/acceptance/**/*
|
||||
|
||||
# We don't use rspec in this way
|
||||
RSpec/DescribeClass:
|
||||
Enabled: False
|
||||
@ -523,9 +531,22 @@ RSpec/RepeatedExample:
|
||||
RSpec/NestedGroups:
|
||||
Enabled: False
|
||||
|
||||
# this is broken on ruby1.9
|
||||
Layout/IndentHeredoc:
|
||||
Enabled: False
|
||||
|
||||
# disable Yaml safe_load. This is needed to support ruby2.0.0 development envs
|
||||
Security/YAMLLoad:
|
||||
Enabled: false
|
||||
|
||||
Security/MarshalLoad:
|
||||
Enabled: false
|
||||
|
||||
# This affects hiera interpolation, as well as some configs that we push.
|
||||
Style/FormatStringToken:
|
||||
Enabled: false
|
||||
|
||||
# This is useful, but sometimes a little too picky about where unit tests files
|
||||
# are located.
|
||||
RSpec/FilePath:
|
||||
Enabled: false
|
||||
|
||||
52
.travis.yml
52
.travis.yml
@ -3,34 +3,50 @@ sudo: false
|
||||
dist: trusty
|
||||
language: ruby
|
||||
cache: bundler
|
||||
bundler_args: --without system_tests development
|
||||
# related to https://github.com/rubygems/rubygems/issues/2123
|
||||
before_install:
|
||||
- bundle -v
|
||||
- rm Gemfile.lock || true
|
||||
- gem update --system
|
||||
- gem update bundler
|
||||
- gem --version
|
||||
- bundle -v
|
||||
- 'rm -f Gemfile.lock'
|
||||
- 'gem update --system'
|
||||
- 'gem install bundler'
|
||||
script:
|
||||
- 'bundle exec rake $CHECK'
|
||||
matrix:
|
||||
fast_finish: true
|
||||
include:
|
||||
- rvm: 2.1.9
|
||||
env: PUPPET_VERSION="~> 4.0" CHECK=test
|
||||
- rvm: 2.2.6
|
||||
env: PUPPET_VERSION="~> 4.0" CHECK=test
|
||||
- rvm: 2.3.3
|
||||
env: PUPPET_VERSION="~> 4.0" CHECK=test
|
||||
- rvm: 2.4.0
|
||||
env: PUPPET_VERSION="~> 4.0" CHECK=test
|
||||
- rvm: 2.4.0
|
||||
env: PUPPET_VERSION="~> 4.0" CHECK=rubocop
|
||||
- rvm: 2.4.0
|
||||
env: PUPPET_VERSION="~> 4.0" CHECK=build
|
||||
bundler_args: --without system_tests development release
|
||||
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.4
|
||||
bundler_args: --without system_tests development release
|
||||
env: PUPPET_VERSION="~> 5.0" CHECK=rubocop
|
||||
- rvm: 2.5.1
|
||||
bundler_args: --without system_tests development release
|
||||
env: PUPPET_VERSION="~> 5.0" CHECK=build
|
||||
branches:
|
||||
only:
|
||||
- master
|
||||
- /^v\d/
|
||||
notifications:
|
||||
email: false
|
||||
irc:
|
||||
on_success: false
|
||||
on_failure: false
|
||||
channels:
|
||||
- "chat.freenode.org#voxpupuli-notifications"
|
||||
deploy:
|
||||
provider: puppetforge
|
||||
user: puppet
|
||||
password:
|
||||
secure: ""
|
||||
on:
|
||||
tags: true
|
||||
# all_branches is required to use tags
|
||||
all_branches: true
|
||||
# Only publish the build marked with "DEPLOY_TO_FORGE"
|
||||
condition: "$DEPLOY_TO_FORGE = yes"
|
||||
|
||||
49
Gemfile
49
Gemfile
@ -11,11 +11,10 @@ def location_for(place, fake_version = nil)
|
||||
end
|
||||
|
||||
group :test do
|
||||
gem 'puppetlabs_spec_helper', '~> 1.2.2', :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
|
||||
gem 'puppet-lint-absolute_classname-check', :require => false
|
||||
gem 'puppet-lint-leading_zero-check', :require => false
|
||||
gem 'puppet-lint-trailing_comma-check', :require => false
|
||||
gem 'puppet-lint-version_comparison-check', :require => false
|
||||
@ -23,33 +22,55 @@ group :test do
|
||||
gem 'puppet-lint-unquoted_string-check', :require => false
|
||||
gem 'puppet-lint-variable_contains_upcase', :require => false
|
||||
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', '~> 1.0.0', :require => false
|
||||
gem 'redcarpet', :require => false
|
||||
gem 'rubocop', '~> 0.47.0', :require => false if RUBY_VERSION >= '2.3.0'
|
||||
gem 'rubocop-rspec', '~> 1.10.0', :require => false if RUBY_VERSION >= '2.3.0'
|
||||
gem 'mocha', '>= 1.2.1', :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.4.0', :require => false
|
||||
gem 'coveralls', :require => false
|
||||
gem 'simplecov-console', :require => false
|
||||
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
|
||||
gem 'travis', :require => false
|
||||
gem 'travis-lint', :require => false
|
||||
gem 'guard-rake', :require => false
|
||||
gem 'overcommit', '>= 0.39.1', :require => false
|
||||
end
|
||||
|
||||
group :system_tests do
|
||||
gem 'winrm', :require => false
|
||||
if beaker_version = ENV['BEAKER_VERSION']
|
||||
gem 'beaker', *location_for(beaker_version)
|
||||
else
|
||||
gem 'beaker', '>= 3.9.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-puppet_install_helper', :require => false
|
||||
gem 'beaker-module_install_helper', :require => false
|
||||
end
|
||||
|
||||
group :release do
|
||||
gem 'github_changelog_generator', :require => false, :git => 'https://github.com/skywinder/github-changelog-generator' if RUBY_VERSION >= '2.2.2'
|
||||
gem 'puppet-blacksmith', :require => false
|
||||
gem 'voxpupuli-release', :require => false, :git => 'https://github.com/voxpupuli/voxpupuli-release-gem'
|
||||
gem 'puppet-strings', '~> 1.0', :require => false
|
||||
end
|
||||
|
||||
group :extra do
|
||||
gem 'net-ldap', '~> 0.16.0', :require => false
|
||||
gem 'net-ldap', '~> 0.12.1', :require => false
|
||||
end
|
||||
|
||||
group :testextra do
|
||||
gem 'rspec-mocks'
|
||||
gem 'rspec-expectations'
|
||||
gem 'rspec-mocks', :require => false
|
||||
gem 'rspec-expectations', :require => false
|
||||
end
|
||||
|
||||
|
||||
@ -60,7 +81,7 @@ else
|
||||
gem 'facter', :require => false, :groups => [:test]
|
||||
end
|
||||
|
||||
ENV['PUPPET_VERSION'].nil? ? puppetversion = '~> 4.0' : puppetversion = ENV['PUPPET_VERSION'].to_s
|
||||
ENV['PUPPET_VERSION'].nil? ? puppetversion = '~> 5.0' : puppetversion = ENV['PUPPET_VERSION'].to_s
|
||||
gem 'puppet', puppetversion, :require => false, :groups => [:test]
|
||||
|
||||
# vim: syntax=ruby
|
||||
|
||||
2
Jenkinsfile
vendored
2
Jenkinsfile
vendored
@ -10,7 +10,7 @@ pipeline {
|
||||
stages {
|
||||
stage('test') {
|
||||
steps {
|
||||
sh '. .env.sh && printenv && bundle install --without=development'
|
||||
sh '. .env.sh && printenv && bundle install --without=development system_tests'
|
||||
sh '. .env.sh && bundle exec rake test'
|
||||
}
|
||||
}
|
||||
|
||||
60
Rakefile
60
Rakefile
@ -1,7 +1,13 @@
|
||||
require 'puppetlabs_spec_helper/rake_tasks'
|
||||
require 'puppet_blacksmith/rake_tasks'
|
||||
require 'voxpupuli/release/rake_tasks'
|
||||
require 'puppet-strings/tasks'
|
||||
|
||||
# load optional tasks for releases
|
||||
# only available if gem group releases is installed
|
||||
begin
|
||||
require 'puppet_blacksmith/rake_tasks'
|
||||
require 'voxpupuli/release/rake_tasks'
|
||||
require 'puppet-strings/tasks'
|
||||
rescue LoadError
|
||||
end
|
||||
|
||||
PuppetLint.configuration.log_format = '%{path}:%{line}:%{check}:%{KIND}:%{message}'
|
||||
PuppetLint.configuration.fail_on_warnings = true
|
||||
@ -20,6 +26,12 @@ exclude_paths = %w(
|
||||
PuppetLint.configuration.ignore_paths = exclude_paths
|
||||
PuppetSyntax.exclude_paths = exclude_paths
|
||||
|
||||
desc 'Auto-correct puppet-lint offenses'
|
||||
task 'lint:auto_correct' do
|
||||
PuppetLint.configuration.fix = true
|
||||
Rake::Task[:lint].invoke
|
||||
end
|
||||
|
||||
desc 'Run acceptance tests'
|
||||
RSpec::Core::RakeTask.new(:acceptance) do |t|
|
||||
t.pattern = 'spec/acceptance'
|
||||
@ -31,13 +43,49 @@ task test: [
|
||||
:release_checks,
|
||||
]
|
||||
|
||||
desc "Run main 'test' task and report merged results to coveralls"
|
||||
task test_with_coveralls: [:test] do
|
||||
if Dir.exist?(File.expand_path('../lib', __FILE__))
|
||||
require 'coveralls/rake/task'
|
||||
Coveralls::RakeTask.new
|
||||
Rake::Task['coveralls:push'].invoke
|
||||
else
|
||||
puts 'Skipping reporting to coveralls. Module has no lib dir'
|
||||
end
|
||||
end
|
||||
|
||||
desc "Print supported beaker sets"
|
||||
task 'beaker_sets', [:directory] do |t, args|
|
||||
directory = args[:directory]
|
||||
|
||||
metadata = JSON.load(File.read('metadata.json'))
|
||||
|
||||
(metadata['operatingsystem_support'] || []).each do |os|
|
||||
(os['operatingsystemrelease'] || []).each do |release|
|
||||
if directory
|
||||
beaker_set = "#{directory}/#{os['operatingsystem'].downcase}-#{release}"
|
||||
else
|
||||
beaker_set = "#{os['operatingsystem'].downcase}-#{release}-x64"
|
||||
end
|
||||
|
||||
filename = "spec/acceptance/nodesets/#{beaker_set}.yml"
|
||||
|
||||
puts beaker_set if File.exists? filename
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
begin
|
||||
require 'github_changelog_generator/task'
|
||||
GitHubChangelogGenerator::RakeTask.new :changelog do |config|
|
||||
version = (Blacksmith::Modulefile.new).version
|
||||
config.future_release = "#{version}"
|
||||
config.header = "# Change log\n\nAll notable changes to this project will be documented in this file.\nEach new release typically also includes the latest modulesync defaults.\nThese should not impact the functionality of the module."
|
||||
config.exclude_labels = %w{duplicate question invalid wontfix modulesync}
|
||||
config.future_release = "v#{version}" if version =~ /^\d+\.\d+.\d+$/
|
||||
config.header = "# Changelog\n\nAll notable changes to this project will be documented in this file.\nEach new release typically also includes the latest modulesync defaults.\nThese should not affect the functionality of the module."
|
||||
config.exclude_labels = %w{duplicate question invalid wontfix wont-fix modulesync skip-changelog}
|
||||
config.user = 'voxpupuli'
|
||||
metadata_json = File.join(File.dirname(__FILE__), 'metadata.json')
|
||||
metadata = JSON.load(File.read(metadata_json))
|
||||
config.project = metadata['name']
|
||||
end
|
||||
rescue LoadError
|
||||
end
|
||||
|
||||
13
spec/acceptance/nodesets/archlinux-2-x64.yml
Normal file
13
spec/acceptance/nodesets/archlinux-2-x64.yml
Normal file
@ -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
|
||||
15
spec/acceptance/nodesets/centos-6-x64.yml
Normal file
15
spec/acceptance/nodesets/centos-6-x64.yml
Normal file
@ -0,0 +1,15 @@
|
||||
---
|
||||
# This file is managed via modulesync
|
||||
# https://github.com/voxpupuli/modulesync
|
||||
# https://github.com/voxpupuli/modulesync_config
|
||||
HOSTS:
|
||||
centos-6-x64:
|
||||
roles:
|
||||
- master
|
||||
platform: el-6-x86_64
|
||||
box: centos/6
|
||||
hypervisor: vagrant
|
||||
CONFIG:
|
||||
type: aio
|
||||
...
|
||||
# vim: syntax=yaml
|
||||
17
spec/acceptance/nodesets/centos-66-x64-pe.yml
Normal file
17
spec/acceptance/nodesets/centos-66-x64-pe.yml
Normal file
@ -0,0 +1,17 @@
|
||||
---
|
||||
# This file is managed via modulesync
|
||||
# https://github.com/voxpupuli/modulesync
|
||||
# https://github.com/voxpupuli/modulesync_config
|
||||
HOSTS:
|
||||
centos-66-x64:
|
||||
roles:
|
||||
- master
|
||||
- database
|
||||
- dashboard
|
||||
platform: el-6-x86_64
|
||||
box: puppetlabs/centos-6.6-64-puppet-enterprise
|
||||
hypervisor: vagrant
|
||||
CONFIG:
|
||||
type: pe
|
||||
...
|
||||
# vim: syntax=yaml
|
||||
15
spec/acceptance/nodesets/centos-7-x64.yml
Normal file
15
spec/acceptance/nodesets/centos-7-x64.yml
Normal file
@ -0,0 +1,15 @@
|
||||
---
|
||||
# This file is managed via modulesync
|
||||
# https://github.com/voxpupuli/modulesync
|
||||
# https://github.com/voxpupuli/modulesync_config
|
||||
HOSTS:
|
||||
centos-7-x64:
|
||||
roles:
|
||||
- master
|
||||
platform: el-7-x86_64
|
||||
box: centos/7
|
||||
hypervisor: vagrant
|
||||
CONFIG:
|
||||
type: aio
|
||||
...
|
||||
# vim: syntax=yaml
|
||||
15
spec/acceptance/nodesets/debian-82-x64.yml
Normal file
15
spec/acceptance/nodesets/debian-82-x64.yml
Normal file
@ -0,0 +1,15 @@
|
||||
---
|
||||
# This file is managed via modulesync
|
||||
# https://github.com/voxpupuli/modulesync
|
||||
# https://github.com/voxpupuli/modulesync_config
|
||||
HOSTS:
|
||||
debian-82-x64:
|
||||
roles:
|
||||
- master
|
||||
platform: debian-8-amd64
|
||||
box: puppetlabs/debian-8.2-64-nocm
|
||||
hypervisor: vagrant
|
||||
CONFIG:
|
||||
type: foss
|
||||
...
|
||||
# vim: syntax=yaml
|
||||
31
spec/acceptance/nodesets/ec2/amazonlinux-2016091.yml
Normal file
31
spec/acceptance/nodesets/ec2/amazonlinux-2016091.yml
Normal file
@ -0,0 +1,31 @@
|
||||
---
|
||||
# This file is managed via modulesync
|
||||
# https://github.com/voxpupuli/modulesync
|
||||
# https://github.com/voxpupuli/modulesync_config
|
||||
#
|
||||
# Additional ~/.fog config file with AWS EC2 credentials
|
||||
# required.
|
||||
#
|
||||
# see: https://github.com/puppetlabs/beaker/blob/master/docs/how_to/hypervisors/ec2.md
|
||||
#
|
||||
# Amazon Linux is not a RHEL clone.
|
||||
#
|
||||
HOSTS:
|
||||
amazonlinux-2016091-x64:
|
||||
roles:
|
||||
- master
|
||||
platform: centos-6-x86_64
|
||||
hypervisor: ec2
|
||||
# refers to image_tempaltes.yaml AMI[vmname] entry:
|
||||
vmname: amazonlinux-2016091-eu-central-1
|
||||
# refers to image_tempaltes.yaml entry inside AMI[vmname][:image]:
|
||||
snapshot: aio
|
||||
# t2.micro is free tier eligible (https://aws.amazon.com/en/free/):
|
||||
amisize: t2.micro
|
||||
# required so that beaker sanitizes sshd_config and root authorized_keys:
|
||||
user: ec2-user
|
||||
CONFIG:
|
||||
type: aio
|
||||
:ec2_yaml: spec/acceptance/nodesets/ec2/image_templates.yaml
|
||||
...
|
||||
# vim: syntax=yaml
|
||||
34
spec/acceptance/nodesets/ec2/image_templates.yaml
Normal file
34
spec/acceptance/nodesets/ec2/image_templates.yaml
Normal file
@ -0,0 +1,34 @@
|
||||
# This file is managed via modulesync
|
||||
# https://github.com/voxpupuli/modulesync
|
||||
# https://github.com/voxpupuli/modulesync_config
|
||||
#
|
||||
# see also: https://github.com/puppetlabs/beaker/blob/master/docs/how_to/hypervisors/ec2.md
|
||||
#
|
||||
# Hint: image IDs (ami-*) for the same image are different per location.
|
||||
#
|
||||
AMI:
|
||||
# Amazon Linux AMI 2016.09.1 (HVM), SSD Volume Type
|
||||
amazonlinux-2016091-eu-central-1:
|
||||
:image:
|
||||
:aio: ami-af0fc0c0
|
||||
:region: eu-central-1
|
||||
# Red Hat Enterprise Linux 7.3 (HVM), SSD Volume Type
|
||||
rhel-73-eu-central-1:
|
||||
:image:
|
||||
:aio: ami-e4c63e8b
|
||||
:region: eu-central-1
|
||||
# SUSE Linux Enterprise Server 12 SP2 (HVM), SSD Volume Type
|
||||
sles-12sp2-eu-central-1:
|
||||
:image:
|
||||
:aio: ami-c425e4ab
|
||||
:region: eu-central-1
|
||||
# Ubuntu Server 16.04 LTS (HVM), SSD Volume Type
|
||||
ubuntu-1604-eu-central-1:
|
||||
:image:
|
||||
:aio: ami-fe408091
|
||||
:region: eu-central-1
|
||||
# Microsoft Windows Server 2016 Base
|
||||
windows-2016-base-eu-central-1:
|
||||
:image:
|
||||
:aio: ami-88ec20e7
|
||||
:region: eu-central-1
|
||||
29
spec/acceptance/nodesets/ec2/rhel-73-x64.yml
Normal file
29
spec/acceptance/nodesets/ec2/rhel-73-x64.yml
Normal file
@ -0,0 +1,29 @@
|
||||
---
|
||||
# This file is managed via modulesync
|
||||
# https://github.com/voxpupuli/modulesync
|
||||
# https://github.com/voxpupuli/modulesync_config
|
||||
#
|
||||
# Additional ~/.fog config file with AWS EC2 credentials
|
||||
# required.
|
||||
#
|
||||
# see: https://github.com/puppetlabs/beaker/blob/master/docs/how_to/hypervisors/ec2.md
|
||||
#
|
||||
HOSTS:
|
||||
rhel-73-x64:
|
||||
roles:
|
||||
- master
|
||||
platform: el-7-x86_64
|
||||
hypervisor: ec2
|
||||
# refers to image_tempaltes.yaml AMI[vmname] entry:
|
||||
vmname: rhel-73-eu-central-1
|
||||
# refers to image_tempaltes.yaml entry inside AMI[vmname][:image]:
|
||||
snapshot: aio
|
||||
# t2.micro is free tier eligible (https://aws.amazon.com/en/free/):
|
||||
amisize: t2.micro
|
||||
# required so that beaker sanitizes sshd_config and root authorized_keys:
|
||||
user: ec2-user
|
||||
CONFIG:
|
||||
type: aio
|
||||
:ec2_yaml: spec/acceptance/nodesets/ec2/image_templates.yaml
|
||||
...
|
||||
# vim: syntax=yaml
|
||||
29
spec/acceptance/nodesets/ec2/sles-12sp2-x64.yml
Normal file
29
spec/acceptance/nodesets/ec2/sles-12sp2-x64.yml
Normal file
@ -0,0 +1,29 @@
|
||||
---
|
||||
# This file is managed via modulesync
|
||||
# https://github.com/voxpupuli/modulesync
|
||||
# https://github.com/voxpupuli/modulesync_config
|
||||
#
|
||||
# Additional ~/.fog config file with AWS EC2 credentials
|
||||
# required.
|
||||
#
|
||||
# see: https://github.com/puppetlabs/beaker/blob/master/docs/how_to/hypervisors/ec2.md
|
||||
#
|
||||
HOSTS:
|
||||
sles-12sp2-x64:
|
||||
roles:
|
||||
- master
|
||||
platform: sles-12-x86_64
|
||||
hypervisor: ec2
|
||||
# refers to image_tempaltes.yaml AMI[vmname] entry:
|
||||
vmname: sles-12sp2-eu-central-1
|
||||
# refers to image_tempaltes.yaml entry inside AMI[vmname][:image]:
|
||||
snapshot: aio
|
||||
# t2.micro is free tier eligible (https://aws.amazon.com/en/free/):
|
||||
amisize: t2.micro
|
||||
# required so that beaker sanitizes sshd_config and root authorized_keys:
|
||||
user: ec2-user
|
||||
CONFIG:
|
||||
type: aio
|
||||
:ec2_yaml: spec/acceptance/nodesets/ec2/image_templates.yaml
|
||||
...
|
||||
# vim: syntax=yaml
|
||||
29
spec/acceptance/nodesets/ec2/ubuntu-1604-x64.yml
Normal file
29
spec/acceptance/nodesets/ec2/ubuntu-1604-x64.yml
Normal file
@ -0,0 +1,29 @@
|
||||
---
|
||||
# This file is managed via modulesync
|
||||
# https://github.com/voxpupuli/modulesync
|
||||
# https://github.com/voxpupuli/modulesync_config
|
||||
#
|
||||
# Additional ~/.fog config file with AWS EC2 credentials
|
||||
# required.
|
||||
#
|
||||
# see: https://github.com/puppetlabs/beaker/blob/master/docs/how_to/hypervisors/ec2.md
|
||||
#
|
||||
HOSTS:
|
||||
ubuntu-1604-x64:
|
||||
roles:
|
||||
- master
|
||||
platform: ubuntu-16.04-amd64
|
||||
hypervisor: ec2
|
||||
# refers to image_tempaltes.yaml AMI[vmname] entry:
|
||||
vmname: ubuntu-1604-eu-central-1
|
||||
# refers to image_tempaltes.yaml entry inside AMI[vmname][:image]:
|
||||
snapshot: aio
|
||||
# t2.micro is free tier eligible (https://aws.amazon.com/en/free/):
|
||||
amisize: t2.micro
|
||||
# required so that beaker sanitizes sshd_config and root authorized_keys:
|
||||
user: ubuntu
|
||||
CONFIG:
|
||||
type: aio
|
||||
:ec2_yaml: spec/acceptance/nodesets/ec2/image_templates.yaml
|
||||
...
|
||||
# vim: syntax=yaml
|
||||
29
spec/acceptance/nodesets/ec2/windows-2016-base-x64.yml
Normal file
29
spec/acceptance/nodesets/ec2/windows-2016-base-x64.yml
Normal file
@ -0,0 +1,29 @@
|
||||
---
|
||||
# This file is managed via modulesync
|
||||
# https://github.com/voxpupuli/modulesync
|
||||
# https://github.com/voxpupuli/modulesync_config
|
||||
#
|
||||
# Additional ~/.fog config file with AWS EC2 credentials
|
||||
# required.
|
||||
#
|
||||
# see: https://github.com/puppetlabs/beaker/blob/master/docs/how_to/hypervisors/ec2.md
|
||||
#
|
||||
HOSTS:
|
||||
windows-2016-base-x64:
|
||||
roles:
|
||||
- master
|
||||
platform: windows-2016-64
|
||||
hypervisor: ec2
|
||||
# refers to image_tempaltes.yaml AMI[vmname] entry:
|
||||
vmname: windows-2016-base-eu-central-1
|
||||
# refers to image_tempaltes.yaml entry inside AMI[vmname][:image]:
|
||||
snapshot: aio
|
||||
# t2.micro is free tier eligible (https://aws.amazon.com/en/free/):
|
||||
amisize: t2.micro
|
||||
# required so that beaker sanitizes sshd_config and root authorized_keys:
|
||||
user: ec2-user
|
||||
CONFIG:
|
||||
type: aio
|
||||
:ec2_yaml: spec/acceptance/nodesets/ec2/image_templates.yaml
|
||||
...
|
||||
# vim: syntax=yaml
|
||||
16
spec/acceptance/nodesets/fedora-25-x64.yml
Normal file
16
spec/acceptance/nodesets/fedora-25-x64.yml
Normal file
@ -0,0 +1,16 @@
|
||||
---
|
||||
# This file is managed via modulesync
|
||||
# https://github.com/voxpupuli/modulesync
|
||||
# https://github.com/voxpupuli/modulesync_config
|
||||
#
|
||||
HOSTS:
|
||||
fedora-25-x64:
|
||||
roles:
|
||||
- master
|
||||
platform: fedora-25-x86_64
|
||||
box: fedora/25-cloud-base
|
||||
hypervisor: vagrant
|
||||
CONFIG:
|
||||
type: aio
|
||||
...
|
||||
# vim: syntax=yaml
|
||||
16
spec/acceptance/nodesets/fedora-26-x64.yml
Normal file
16
spec/acceptance/nodesets/fedora-26-x64.yml
Normal file
@ -0,0 +1,16 @@
|
||||
---
|
||||
# This file is managed via modulesync
|
||||
# https://github.com/voxpupuli/modulesync
|
||||
# https://github.com/voxpupuli/modulesync_config
|
||||
#
|
||||
HOSTS:
|
||||
fedora-26-x64:
|
||||
roles:
|
||||
- master
|
||||
platform: fedora-26-x86_64
|
||||
box: fedora/26-cloud-base
|
||||
hypervisor: vagrant
|
||||
CONFIG:
|
||||
type: aio
|
||||
...
|
||||
# vim: syntax=yaml
|
||||
18
spec/acceptance/nodesets/fedora-27-x64.yml
Normal file
18
spec/acceptance/nodesets/fedora-27-x64.yml
Normal file
@ -0,0 +1,18 @@
|
||||
---
|
||||
# This file is managed via modulesync
|
||||
# https://github.com/voxpupuli/modulesync
|
||||
# https://github.com/voxpupuli/modulesync_config
|
||||
#
|
||||
# platform is fedora 26 because there is no puppet-agent
|
||||
# for fedora 27 as of 2017-11-17
|
||||
HOSTS:
|
||||
fedora-27-x64:
|
||||
roles:
|
||||
- master
|
||||
platform: fedora-26-x86_64
|
||||
box: fedora/27-cloud-base
|
||||
hypervisor: vagrant
|
||||
CONFIG:
|
||||
type: aio
|
||||
...
|
||||
# vim: syntax=yaml
|
||||
15
spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
Normal file
15
spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
Normal file
@ -0,0 +1,15 @@
|
||||
---
|
||||
# This file is managed via modulesync
|
||||
# https://github.com/voxpupuli/modulesync
|
||||
# https://github.com/voxpupuli/modulesync_config
|
||||
HOSTS:
|
||||
ubuntu-server-1404-x64:
|
||||
roles:
|
||||
- master
|
||||
platform: ubuntu-14.04-amd64
|
||||
box: puppetlabs/ubuntu-14.04-64-nocm
|
||||
hypervisor: vagrant
|
||||
CONFIG:
|
||||
type: foss
|
||||
...
|
||||
# vim: syntax=yaml
|
||||
15
spec/acceptance/nodesets/ubuntu-server-1604-x64.yml
Normal file
15
spec/acceptance/nodesets/ubuntu-server-1604-x64.yml
Normal file
@ -0,0 +1,15 @@
|
||||
---
|
||||
# This file is managed via modulesync
|
||||
# https://github.com/voxpupuli/modulesync
|
||||
# https://github.com/voxpupuli/modulesync_config
|
||||
HOSTS:
|
||||
ubuntu-server-1604-x64:
|
||||
roles:
|
||||
- master
|
||||
platform: ubuntu-16.04-amd64
|
||||
box: puppetlabs/ubuntu-16.04-64-nocm
|
||||
hypervisor: vagrant
|
||||
CONFIG:
|
||||
type: foss
|
||||
...
|
||||
# vim: syntax=yaml
|
||||
@ -2,14 +2,17 @@ require 'puppetlabs_spec_helper/module_spec_helper'
|
||||
require 'rspec-puppet-facts'
|
||||
include RspecPuppetFacts
|
||||
|
||||
# This file is managed via modulesync
|
||||
# https://github.com/voxpupuli/modulesync
|
||||
# https://github.com/xaque208/modulesync_config
|
||||
|
||||
if Dir.exist?(File.expand_path('../../lib', __FILE__))
|
||||
require 'coveralls'
|
||||
require 'simplecov'
|
||||
require 'simplecov-console'
|
||||
SimpleCov.formatters = [
|
||||
SimpleCov::Formatter::HTMLFormatter,
|
||||
SimpleCov::Formatter::Console,
|
||||
Coveralls::SimpleCov::Formatter
|
||||
SimpleCov::Formatter::Console
|
||||
]
|
||||
SimpleCov.start do
|
||||
track_files 'lib/**/*.rb'
|
||||
|
||||
@ -44,7 +44,7 @@ describe 'PuppetX::LDAPquery' do
|
||||
filter = '(uid=zach)'
|
||||
attributes = ['objectClass']
|
||||
|
||||
wanted = [{ 'dn' => ['uid=zach,ou=users,dc=puppetlabs,dc=com'], 'objectclass' => %w(posixAccount shadowAccount inetOrgPerson puppetPerson ldapPublicKey top) }]
|
||||
wanted = [{ 'dn' => ['uid=zach,ou=users,dc=puppetlabs,dc=com'], 'objectclass' => %w[posixAccount shadowAccount inetOrgPerson puppetPerson ldapPublicKey top] }]
|
||||
|
||||
entries = Marshal.load(File.read('spec/fixtures/entries_objectClass.obj'))
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user