Migrating into modulesync
This commit is contained in:
parent
d464846637
commit
8d8e63ef40
13
.gitignore
vendored
13
.gitignore
vendored
@ -1,4 +1,9 @@
|
|||||||
/.bundle/
|
pkg/
|
||||||
/vendor/
|
Gemfile.lock
|
||||||
/pkg/
|
vendor/
|
||||||
|
spec/fixtures/
|
||||||
|
.vagrant/
|
||||||
|
.bundle/
|
||||||
|
coverage/
|
||||||
|
.idea/
|
||||||
|
*.iml
|
||||||
|
24
.travis.yml
Normal file
24
.travis.yml
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
---
|
||||||
|
sudo: false
|
||||||
|
language: ruby
|
||||||
|
bundler_args: --without system_tests
|
||||||
|
script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
|
||||||
|
matrix:
|
||||||
|
fast_finish: true
|
||||||
|
include:
|
||||||
|
- rvm: 1.8.7
|
||||||
|
env: PUPPET_GEM_VERSION="~> 3.0"
|
||||||
|
- rvm: 1.9.3
|
||||||
|
env: PUPPET_GEM_VERSION="~> 3.0"
|
||||||
|
- rvm: 1.9.3
|
||||||
|
env: PUPPET_GEM_VERSION="~> 3.4.0"
|
||||||
|
- rvm: 1.9.3
|
||||||
|
env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
|
||||||
|
- rvm: 2.1.5
|
||||||
|
env: PUPPET_GEM_VERSION="~> 3.0"
|
||||||
|
- rvm: 2.1.5
|
||||||
|
env: PUPPET_GEM_VERSION="~> 3.4.0"
|
||||||
|
- rvm: 2.1.5
|
||||||
|
env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
|
||||||
|
notifications:
|
||||||
|
email: false
|
135
CONTRIBUTING.md
Normal file
135
CONTRIBUTING.md
Normal file
@ -0,0 +1,135 @@
|
|||||||
|
Checklist (and a short version for the impatient)
|
||||||
|
=================================================
|
||||||
|
|
||||||
|
* Commits:
|
||||||
|
|
||||||
|
- Make commits of logical units.
|
||||||
|
|
||||||
|
- Check for unnecessary whitespace with "git diff --check" before
|
||||||
|
committing.
|
||||||
|
|
||||||
|
- Commit using Unix line endings (check the settings around "crlf" in
|
||||||
|
git-config(1)).
|
||||||
|
|
||||||
|
- Do not check in commented out code or unneeded files.
|
||||||
|
|
||||||
|
- The first line of the commit message should be a short
|
||||||
|
description (50 characters is the soft limit, excluding ticket
|
||||||
|
number(s)), and should skip the full stop.
|
||||||
|
|
||||||
|
- Associate the issue in the message. The first line should include
|
||||||
|
the issue number in the form "(#XXXX) Rest of message".
|
||||||
|
|
||||||
|
- The body should provide a meaningful commit message, which:
|
||||||
|
|
||||||
|
- uses the imperative, present tense: "change", not "changed" or
|
||||||
|
"changes".
|
||||||
|
|
||||||
|
- includes motivation for the change, and contrasts its
|
||||||
|
implementation with the previous behavior.
|
||||||
|
|
||||||
|
- Make sure that you have tests for the bug you are fixing, or
|
||||||
|
feature you are adding.
|
||||||
|
|
||||||
|
- Make sure the test suites passes after your commit:
|
||||||
|
`bundle exec rspec spec/acceptance` More information on [testing](#Testing) below
|
||||||
|
|
||||||
|
- When introducing a new feature, make sure it is properly
|
||||||
|
documented in the README.md
|
||||||
|
|
||||||
|
* Submission:
|
||||||
|
|
||||||
|
* Pre-requisites:
|
||||||
|
|
||||||
|
- Make sure you have a [GitHub account](https://github.com/join)
|
||||||
|
|
||||||
|
* Preferred method:
|
||||||
|
|
||||||
|
- Fork the repository on GitHub.
|
||||||
|
|
||||||
|
- Push your changes to a topic branch in your fork of the
|
||||||
|
repository. (the format ticket/1234-short_description_of_change is
|
||||||
|
usually preferred for this project).
|
||||||
|
|
||||||
|
- Submit a pull request to the repository in the OpenConceptConsulting
|
||||||
|
organization.
|
||||||
|
|
||||||
|
Testing
|
||||||
|
=======
|
||||||
|
|
||||||
|
Getting Started
|
||||||
|
---------------
|
||||||
|
|
||||||
|
Our puppet modules provide [`Gemfile`](./Gemfile)s which can tell a ruby
|
||||||
|
package manager such as [bundler](http://bundler.io/) what Ruby packages,
|
||||||
|
or Gems, are required to build, develop, and test this software.
|
||||||
|
|
||||||
|
Please make sure you have [bundler installed](http://bundler.io/#getting-started)
|
||||||
|
on your system, then use it to install all dependencies needed for this project,
|
||||||
|
by running
|
||||||
|
|
||||||
|
```shell
|
||||||
|
% bundle install
|
||||||
|
Fetching gem metadata from https://rubygems.org/........
|
||||||
|
Fetching gem metadata from https://rubygems.org/..
|
||||||
|
Using rake (10.1.0)
|
||||||
|
Using builder (3.2.2)
|
||||||
|
-- 8><-- many more --><8 --
|
||||||
|
Using rspec-system-puppet (2.2.0)
|
||||||
|
Using serverspec (0.6.3)
|
||||||
|
Using rspec-system-serverspec (1.0.0)
|
||||||
|
Using bundler (1.3.5)
|
||||||
|
Your bundle is complete!
|
||||||
|
Use `bundle show [gemname]` to see where a bundled gem is installed.
|
||||||
|
```
|
||||||
|
|
||||||
|
NOTE some systems may require you to run this command with sudo.
|
||||||
|
|
||||||
|
If you already have those gems installed, make sure they are up-to-date:
|
||||||
|
|
||||||
|
```shell
|
||||||
|
% bundle update
|
||||||
|
```
|
||||||
|
|
||||||
|
With all dependencies in place and up-to-date we can now run the tests:
|
||||||
|
|
||||||
|
```shell
|
||||||
|
% rake spec
|
||||||
|
```
|
||||||
|
|
||||||
|
This will execute all the [rspec tests](http://rspec-puppet.com/) tests
|
||||||
|
under [spec/defines](./spec/defines), [spec/classes](./spec/classes),
|
||||||
|
and so on. rspec tests may have the same kind of dependencies as the
|
||||||
|
module they are testing. While the module defines in its [Modulefile](./Modulefile),
|
||||||
|
rspec tests define them in [.fixtures.yml](./fixtures.yml).
|
||||||
|
|
||||||
|
Some puppet modules also come with [beaker](https://github.com/puppetlabs/beaker)
|
||||||
|
tests. These tests spin up a virtual machine under
|
||||||
|
[VirtualBox](https://www.virtualbox.org/)) with, controlling it with
|
||||||
|
[Vagrant](http://www.vagrantup.com/) to actually simulate scripted test
|
||||||
|
scenarios. In order to run these, you will need both of those tools
|
||||||
|
installed on your system.
|
||||||
|
|
||||||
|
You can run them by issuing the following command
|
||||||
|
|
||||||
|
```shell
|
||||||
|
% rake spec_clean
|
||||||
|
% rspec spec/acceptance
|
||||||
|
```
|
||||||
|
|
||||||
|
This will now download a pre-fabricated image configured in the [default node-set](./spec/acceptance/nodesets/default.yml),
|
||||||
|
install puppet, copy this module and install its dependencies per [spec/spec_helper_acceptance.rb](./spec/spec_helper_acceptance.rb)
|
||||||
|
and then run all the tests under [spec/acceptance](./spec/acceptance).
|
||||||
|
|
||||||
|
Writing Tests
|
||||||
|
-------------
|
||||||
|
|
||||||
|
XXX getting started writing tests.
|
||||||
|
|
||||||
|
Additional Resources
|
||||||
|
====================
|
||||||
|
|
||||||
|
* [General GitHub documentation](http://help.github.com/)
|
||||||
|
|
||||||
|
* [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
|
||||||
|
|
32
Gemfile
32
Gemfile
@ -1,36 +1,30 @@
|
|||||||
source 'https://rubygems.org'
|
source ENV['GEM_SOURCE'] || 'https://rubygems.org'
|
||||||
|
|
||||||
def location_for(place, fake_version = nil)
|
|
||||||
if place =~ /^(git[:@][^#]*)#(.*)/
|
|
||||||
[fake_version, { :git => $1, :branch => $2, :require => false }].compact
|
|
||||||
elsif place =~ /^file:\/\/(.*)/
|
|
||||||
['>= 0', { :path => File.expand_path($1), :require => false }]
|
|
||||||
else
|
|
||||||
[place, { :require => false }]
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
group :development, :unit_tests do
|
group :development, :unit_tests do
|
||||||
gem 'rake', '~> 10.1.0', :require => false
|
gem 'rake', '~> 10.1.0', :require => false
|
||||||
gem 'rspec', '~> 3.1.0', :require => false
|
gem 'rspec-core', '~> 3.1.0', :require => false
|
||||||
gem 'rspec-puppet', :require => false
|
gem 'rspec-puppet', :require => false
|
||||||
gem 'puppetlabs_spec_helper', :require => false
|
gem 'puppetlabs_spec_helper', :require => false
|
||||||
gem 'puppet-lint', '< 1.1.0', :require => false
|
gem 'puppet-lint', '< 1.1.0', :require => false
|
||||||
gem 'metadata-json-lint', :require => false
|
gem 'metadata-json-lint', :require => false
|
||||||
gem 'pry', :require => false
|
|
||||||
gem 'simplecov', :require => false
|
gem 'simplecov', :require => false
|
||||||
|
gem 'puppet_facts', :require => false
|
||||||
|
gem 'json', :require => false
|
||||||
end
|
end
|
||||||
|
|
||||||
facterversion = ENV['GEM_FACTER_VERSION'] || ENV['FACTER_GEM_VERSION']
|
group :system_tests do
|
||||||
if facterversion
|
gem 'beaker-rspec', :require => false
|
||||||
gem 'facter', *location_for(facterversion)
|
gem 'serverspec', :require => false
|
||||||
|
end
|
||||||
|
|
||||||
|
if facterversion = ENV['FACTER_GEM_VERSION']
|
||||||
|
gem 'facter', facterversion, :require => false
|
||||||
else
|
else
|
||||||
gem 'facter', :require => false
|
gem 'facter', :require => false
|
||||||
end
|
end
|
||||||
|
|
||||||
puppetversion = ENV['GEM_PUPPET_VERSION'] || ENV['PUPPET_GEM_VERSION']
|
if puppetversion = ENV['PUPPET_GEM_VERSION']
|
||||||
if puppetversion
|
gem 'puppet', puppetversion, :require => false
|
||||||
gem 'puppet', *location_for(puppetversion)
|
|
||||||
else
|
else
|
||||||
gem 'puppet', :require => false
|
gem 'puppet', :require => false
|
||||||
end
|
end
|
||||||
|
6
Rakefile
6
Rakefile
@ -1,7 +1,10 @@
|
|||||||
require 'rubygems'
|
|
||||||
require 'puppetlabs_spec_helper/rake_tasks'
|
require 'puppetlabs_spec_helper/rake_tasks'
|
||||||
require 'puppet-lint/tasks/puppet-lint'
|
require 'puppet-lint/tasks/puppet-lint'
|
||||||
|
|
||||||
|
PuppetLint.configuration.fail_on_warnings = true
|
||||||
|
PuppetLint.configuration.send('relative')
|
||||||
PuppetLint.configuration.send('disable_80chars')
|
PuppetLint.configuration.send('disable_80chars')
|
||||||
|
PuppetLint.configuration.send('disable_class_inherits_from_params_class')
|
||||||
PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
|
PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
|
||||||
|
|
||||||
desc "Validate manifests, templates, and ruby files"
|
desc "Validate manifests, templates, and ruby files"
|
||||||
@ -16,3 +19,4 @@ task :validate do
|
|||||||
sh "erb -P -x -T '-' #{template} | ruby -c"
|
sh "erb -P -x -T '-' #{template} | ruby -c"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
12
spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml
Normal file
12
spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
HOSTS:
|
||||||
|
ubuntu-1204-x64:
|
||||||
|
default_apply_opts:
|
||||||
|
strict_variables:
|
||||||
|
platform: ubuntu-12.04-amd64
|
||||||
|
hypervisor : docker
|
||||||
|
image: ubuntu:12.04
|
||||||
|
# This stops the image from being deleted on completion, speeding up the process.
|
||||||
|
docker_preserve_image: true
|
||||||
|
CONFIG:
|
||||||
|
type: foss
|
||||||
|
log_level: debug
|
10
spec/acceptance/nodesets/ubuntu-12.04-x86_64-vagrant.yml
Normal file
10
spec/acceptance/nodesets/ubuntu-12.04-x86_64-vagrant.yml
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
HOSTS:
|
||||||
|
ubuntu-1204-x64:
|
||||||
|
default_apply_opts:
|
||||||
|
strict_variables:
|
||||||
|
platform: ubuntu-12.04-amd64
|
||||||
|
hypervisor : vagrant
|
||||||
|
box : puppetlabs/ubuntu-12.04-64-nocm
|
||||||
|
CONFIG:
|
||||||
|
type: foss
|
||||||
|
log_level: debug
|
12
spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml
Normal file
12
spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
HOSTS:
|
||||||
|
ubuntu-1404-x64:
|
||||||
|
default_apply_opts:
|
||||||
|
strict_variables:
|
||||||
|
platform: ubuntu-14.04-amd64
|
||||||
|
hypervisor : docker
|
||||||
|
image: ubuntu:14.04
|
||||||
|
# This stops the image from being deleted on completion, speeding up the process.
|
||||||
|
docker_preserve_image: true
|
||||||
|
CONFIG:
|
||||||
|
type: foss
|
||||||
|
log_level: debug
|
10
spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml
Normal file
10
spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
HOSTS:
|
||||||
|
ubuntu-1404-x64:
|
||||||
|
default_apply_opts:
|
||||||
|
strict_variables:
|
||||||
|
platform: ubuntu-14.04-amd64
|
||||||
|
hypervisor : vagrant
|
||||||
|
box : puppetlabs/ubuntu-14.04-64-nocm
|
||||||
|
CONFIG:
|
||||||
|
type: foss
|
||||||
|
log_level: debug
|
@ -26,3 +26,4 @@ RSpec.configure do |c|
|
|||||||
PuppetlabsSpec::Files.cleanup
|
PuppetlabsSpec::Files.cleanup
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user