Skip to content

Commit

Permalink
module sync update (#158)
Browse files Browse the repository at this point in the history
  • Loading branch information
jlsherrill authored Nov 22, 2016
1 parent 46216f7 commit ffc668d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
9 changes: 3 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,17 @@
# This file is managed centrally by modulesync
# https://github.com/katello/foreman-installer-modulesync
rvm:
- 1.9.3
- 2.0.0
- 2.1.5
env:
- PUPPET_VERSION=3.5 ONLY_OS=redhat-7-x86_64,centos-7-x86_64
- PUPPET_VERSION=3.5 FUTURE_PARSER=yes ONLY_OS=redhat-7-x86_64,centos-7-x86_64
- PUPPET_VERSION=4.0 ONLY_OS=redhat-7-x86_64,centos-7-x86_64
matrix:
fast_finish: true
exclude:
# No support for Ruby 1.9.3 on Puppet 4.x
- rvm: 1.9.3
env: PUPPET_VERSION=4.0 ONLY_OS=redhat-7-x86_64,centos-7-x86_64
include:
# Only EL7 uses Ruby 2.0.0 to run Puppet 3.x
- rvm: 2.0.0
env: PUPPET_VERSION=3.5 ONLY_OS="centos-7-x86_64"
# Only Puppet 4.x supports Ruby 2.2. Also limit the OS set we test Ruby 2.2 with.
- rvm: 2.2.3
env: PUPPET_VERSION=4.0 ONLY_OS=redhat-7-x86_64,centos-7-x86_64
Expand Down
3 changes: 3 additions & 0 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ end
PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp", "vendor/**/*.pp"]
PuppetLint.configuration.log_format = '%{path}:%{linenumber}:%{KIND}: %{message}'

# Used for type alias tests
PuppetSyntax.exclude_paths << 'spec/static_fixtures/test_module/**/*.pp' if Puppet.version.to_f < 4.0

require 'puppet-lint-param-docs/tasks'
PuppetLintParamDocs.define_selective do |config|
config.pattern = ["manifests/init.pp"]
Expand Down

0 comments on commit ffc668d

Please # to comment.