Skip to content
Snippets Groups Projects
Unverified Commit 8bc6a403 authored by Raphaël Pinson's avatar Raphaël Pinson
Browse files

modulesync

parent 52cfe0ea
No related branches found
No related tags found
No related merge requests found
--fail-on-warnings --fail-on-warnings
--relative --relative
--no-80chars --no-140chars
--no-documentation --no-documentation
--no-class_inherits_from_params_class-check --no-class_inherits_from_params_class-check
...@@ -5,14 +5,14 @@ addons: ...@@ -5,14 +5,14 @@ addons:
apt: apt:
packages: packages:
- libaugeas-dev - libaugeas-dev
sources:
- augeas
cache: bundler cache: bundler
bundler_args: --without system_tests bundler_args: --without system_tests
script: ["bundle exec rake validate", "bundle exec rake lint", "bundle exec rake spec SPEC_OPTS='--format documentation'"] script: ["bundle exec rake validate", "bundle exec rake lint", "bundle exec rake spec SPEC_OPTS='--format documentation'"]
matrix: matrix:
fast_finish: true fast_finish: true
include: include:
- rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 3.0" FACTER_GEM_VERSION="~> 1.7.0"
- rvm: 1.9.3 - rvm: 1.9.3
env: PUPPET_GEM_VERSION="~> 3.0" env: PUPPET_GEM_VERSION="~> 3.0"
- rvm: 2.0.0 - rvm: 2.0.0
......
source ENV['GEM_SOURCE'] || "https://rubygems.org" source ENV['GEM_SOURCE'] || "https://rubygems.org"
group :development, :unit_tests do group :development, :unit_tests do
gem 'rake', ' < 11.0', :require => false if RUBY_VERSION =~ /^1\.8/ gem 'rake', :require => false
gem 'rspec', '< 3.2', :require => false if RUBY_VERSION =~ /^1\.8/ gem 'rspec', :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 'metadata-json-lint', :require => false gem 'metadata-json-lint', :require => false
...@@ -17,12 +17,12 @@ group :development, :unit_tests do ...@@ -17,12 +17,12 @@ group :development, :unit_tests do
gem 'puppet-lint-trailing_comma-check', :require => false gem 'puppet-lint-trailing_comma-check', :require => false
gem 'puppet-lint-file_ensure-check', :require => false gem 'puppet-lint-file_ensure-check', :require => false
gem 'puppet-lint-version_comparison-check', :require => false gem 'puppet-lint-version_comparison-check', :require => false
gem 'puppet-lint-fileserver-check', :require => false
gem 'puppet-lint-file_source_rights-check', :require => false gem 'puppet-lint-file_source_rights-check', :require => false
gem 'puppet-lint-alias-check', :require => false gem 'puppet-lint-alias-check', :require => false
gem 'rspec-puppet-facts', :require => false gem 'rspec-puppet-facts', :require => false
gem 'ruby-augeas', :require => false gem 'ruby-augeas', :require => false
gem 'puppet-blacksmith', :require => false if RUBY_VERSION !~ /^1\./ gem 'puppet-blacksmith', :require => false if RUBY_VERSION !~ /^1\./
gem 'json_pure', '< 2.0.2', :require => false
end end
group :system_tests do group :system_tests do
...@@ -30,6 +30,7 @@ group :system_tests do ...@@ -30,6 +30,7 @@ group :system_tests do
gem 'beaker-rspec', :require => false gem 'beaker-rspec', :require => false
gem 'beaker_spec_helper', :require => false gem 'beaker_spec_helper', :require => false
gem 'serverspec', :require => false gem 'serverspec', :require => false
gem 'specinfra', :require => false
end end
if facterversion = ENV['FACTER_GEM_VERSION'] if facterversion = ENV['FACTER_GEM_VERSION']
......
...@@ -4,7 +4,7 @@ require 'puppet-lint/tasks/puppet-lint' ...@@ -4,7 +4,7 @@ require 'puppet-lint/tasks/puppet-lint'
Rake::Task[:lint].clear Rake::Task[:lint].clear
PuppetLint::RakeTask.new :lint do |config| PuppetLint::RakeTask.new :lint do |config|
config.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp", "vendor/**/*.pp"] config.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp", "vendor/**/*.pp"]
config.disable_checks = ['80chars'] config.disable_checks = ['140chars']
config.fail_on_warnings = true config.fail_on_warnings = true
end end
...@@ -14,10 +14,4 @@ PuppetSyntax.exclude_paths = ["spec/fixtures/**/*.pp", "vendor/**/*"] ...@@ -14,10 +14,4 @@ PuppetSyntax.exclude_paths = ["spec/fixtures/**/*.pp", "vendor/**/*"]
unless RUBY_VERSION =~ /^1\./ unless RUBY_VERSION =~ /^1\./
require 'puppet_blacksmith' require 'puppet_blacksmith'
require 'puppet_blacksmith/rake_tasks' require 'puppet_blacksmith/rake_tasks'
#require 'github_changelog_generator/task'
#GitHubChangelogGenerator::RakeTask.new :changelog do |config|
# m = Blacksmith::Modulefile.new
# config.future_release = m.version
# config.release_url = "https://forge.puppetlabs.com/#{m.author}/#{m.name}/%s"
#end
end end
...@@ -10,6 +10,7 @@ HOSTS: ...@@ -10,6 +10,7 @@ HOSTS:
docker_cmd: '["/sbin/init"]' docker_cmd: '["/sbin/init"]'
docker_image_commands: docker_image_commands:
- 'yum install -y crontabs tar wget which' - 'yum install -y crontabs tar wget which'
- 'sed -i -e "/mingetty/d" /etc/inittab'
CONFIG: CONFIG:
type: aio type: aio
log_level: debug log_level: debug
...@@ -11,6 +11,7 @@ HOSTS: ...@@ -11,6 +11,7 @@ HOSTS:
docker_image_commands: docker_image_commands:
- 'rm -rf /var/run/network/*' - 'rm -rf /var/run/network/*'
- 'yum install -y crontabs tar wget' - 'yum install -y crontabs tar wget'
- 'rm /etc/init/tty.conf'
CONFIG: CONFIG:
type: aio type: aio
log_level: debug log_level: debug
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment