Unverified Commit 0459438c authored by Dominic Cleal's avatar Dominic Cleal
Browse files

Refresh Gemfile etc from modulesync to run Puppet 4 tests

parent e1c4e3dc
......@@ -11,9 +11,9 @@ if [ -z $AUGEAS ]; then
else
if [ -z $LENSES ]; then
# Use matching version of lenses
cd augeas && git checkout release-${AUGEAS}
cd augeas && git fetch && git checkout release-${AUGEAS}
else
cd augeas && git checkout $LENSES
cd augeas && git fetch && git checkout $LENSES
fi
PKG_VERSION="=${AUGEAS}*"
......@@ -33,7 +33,7 @@ sudo apt-get install augeas-tools${PKG_VERSION} \
# Install gems
gem install bundler
bundle update puppet
bundle install
# Reporting only
bundle show
......
language: ruby
sudo: required
rvm:
- 1.8.7
- 1.9.3
......@@ -8,6 +9,7 @@ notifications:
- dcleal@redhat.com
- raphael.pinson@camptocamp.com
env:
# base env
# Most tests with oldest supported ruby-augeas
- PUPPET=2.7.0 RUBY_AUGEAS=0.3.0 AUGEAS=1.1.0
- PUPPET=3.0.0 RUBY_AUGEAS=0.3.0 AUGEAS=1.1.0
......@@ -15,7 +17,8 @@ env:
- PUPPET=3.4 RUBY_AUGEAS=0.3.0 AUGEAS=1.1.0
# Test the latest ruby-augeas (~>)
- PUPPET=3.2.0 RUBY_AUGEAS=0.5
- PUPPET=3.4 RUBY_AUGEAS=0.5
# Use this build to publish on the forge
- PUPPET=3.4 RUBY_AUGEAS=0.5 FORGE_PUBLISH=true
# Test other versions of Augeas
- PUPPET=2.7.0 RUBY_AUGEAS=0.3.0 AUGEAS=0.10.0
- PUPPET=3.4 RUBY_AUGEAS=0.3.0 AUGEAS=0.10.0
......@@ -30,9 +33,14 @@ env:
- PUPPET=3.4 RUBY_AUGEAS=0.3.0 AUGEAS=1.1.0 LENSES=HEAD
- PUPPET=3.4 RUBY_AUGEAS=0.5 AUGEAS=1.0.0 LENSES=HEAD
- PUPPET=3.4 RUBY_AUGEAS=0.5 AUGEAS=1.1.0 LENSES=HEAD
# Test latest Puppet version
- PUPPET=4.0 RUBY_AUGEAS=0.5
matrix:
fast_finish: true
exclude:
# base exclude
# No support for Ruby 2.0 before Puppet 3.2.0 and ruby-augeas 0.5
- rvm: 2.0.0
env: PUPPET=2.7.0 RUBY_AUGEAS=0.3.0 AUGEAS=1.1.0
......@@ -64,7 +72,26 @@ matrix:
env: PUPPET=3.4 RUBY_AUGEAS=0.3.0 AUGEAS=1.0.0 LENSES=HEAD
- rvm: 2.0.0
env: PUPPET=3.4 RUBY_AUGEAS=0.3.0 AUGEAS=1.1.0 LENSES=HEAD
# No support for Ruby 1.8 in Puppet 4
- rvm: 1.8.7
env: PUPPET=4.0 RUBY_AUGEAS=0.5
install:
- "travis_retry ./.travis.sh"
script:
- AUGEAS_LENS_LIB=augeas/lenses bundle exec rake
- AUGEAS_LENS_LIB=lib/augeas/lenses:augeas/lenses bundle exec rake
# Do not include the augeas/ directory in the deployed module
- rm -rf augeas/
deploy:
provider: puppetforge
user: herculesteam
password:
secure: "coX6r+20OFHKTVGYb4E+1lr4AFCG5h1GeqjWY0Esfz5vAs42d/ZbLzwP6j19VXWehBitGRWkBerWU9ZIneIcPUQlRhRRCWt+XCv+6XZREdq2610RIZnva4NsLD/SCzXdC9gSfIWvGnI9fWNAQS/stgC/jkyCkFNn2i0s7qWEvA0="
on:
tags: true
# all_branches is required to use tags
all_branches: true
# Only publish if our main Ruby target builds
rvm: 1.9.3
condition: "$FORGE_PUBLISH = true"
......@@ -19,19 +19,31 @@ else
end
gem 'ruby-augeas', rbaugversion
group :development do
gem 'puppet-lint'
gem 'puppet-syntax'
gem 'puppetlabs_spec_helper', '>= 0.4.1'
gem 'rake'
gem 'rspec-puppet', :git => 'https://github.com/rodjek/rspec-puppet.git', :ref => '544b168'
gem 'simplecov'
gem 'yard'
gem 'redcarpet', '~> 2.0'
gem 'pry'
gem 'beaker', :require => false, :git => 'https://github.com/puppetlabs/beaker', :ref => 'dbac20fe9'
gem 'beaker-rspec', :require => false
gem 'vagrant-wrapper', :require => false
group :development, :unit_tests do
gem 'rake', ' < 11.0', :require => false if RUBY_VERSION =~ /^1\.8/
gem 'rspec', '< 3.2', :require => false if RUBY_VERSION =~ /^1\.8/
gem 'json', '< 2.0', :require => false if RUBY_VERSION =~ /^1\.8/
gem 'rspec-puppet', :require => false
gem 'puppetlabs_spec_helper', :require => false
gem 'metadata-json-lint', :require => false
gem 'puppet-lint', :require => false
gem 'puppet-lint-unquoted_string-check', :require => false
gem 'puppet-lint-empty_string-check', :require => false
gem 'puppet-lint-spaceship_operator_without_tag-check', :require => false
gem 'puppet-lint-variable_contains_upcase', :require => false
gem 'puppet-lint-absolute_classname-check', :require => false
gem 'puppet-lint-undef_in_function-check', :require => false
gem 'puppet-lint-leading_zero-check', :require => false
gem 'puppet-lint-trailing_comma-check', :require => false
gem 'puppet-lint-file_ensure-check', :require => false
gem 'puppet-lint-version_comparison-check', :require => false
gem 'rspec-puppet-facts', :require => false
gem 'coveralls' unless RUBY_VERSION =~ /^1\.8/
gem 'coveralls', :require => false unless RUBY_VERSION =~ /^1\.8/
gem 'simplecov', '~> 0.7.0', :require => false
gem 'yard', :require => false
gem 'redcarpet', '~> 2.0', :require => false
# mime-types-data requires Ruby version >= 2.0
gem 'mime-types', '2.6.2' if RUBY_VERSION =~ /^1\.9/
end
GIT
remote: https://github.com/puppetlabs/beaker
revision: dbac20fe9cbe5d581564a64934bec82fc3b1cabc
ref: dbac20fe9
specs:
beaker (1.6.2)
blimpy (~> 0.6)
fission (~> 0.4)
inifile (~> 2.0)
json (~> 1.8)
mime-types (~> 1.25)
net-scp (~> 1.1)
net-ssh (~> 2.6)
nokogiri (= 1.5.10)
rbvmomi (= 1.8.1)
unf (~> 0.1)
GIT
remote: https://github.com/rodjek/rspec-puppet.git
revision: 544b168390001eba8941f36b466afa4f26e89057
ref: 544b168
specs:
rspec-puppet (1.0.1)
rspec
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (2.2.7)
beaker-rspec (2.1.1)
beaker (~> 1.3)
rspec (~> 2.14)
serverspec (~> 0.14)
specinfra (~> 0.3)
blimpy (0.6.7)
fog
minitar
thor
builder (3.2.2)
coderay (1.0.9)
diff-lcs (1.2.4)
excon (0.31.0)
facter (1.7.5)
fission (0.5.0)
CFPropertyList (~> 2.2)
fog (1.19.0)
builder
excon (~> 0.31.0)
formatador (~> 0.2.0)
mime-types
multi_json (~> 1.0)
net-scp (~> 1.1)
net-ssh (>= 2.1.3)
nokogiri (~> 1.5)
ruby-hmac
formatador (0.2.4)
hiera (1.3.2)
json_pure
highline (1.6.21)
inifile (2.0.2)
json (1.8.1)
json_pure (1.8.1)
metaclass (0.0.1)
method_source (0.8.2)
mime-types (1.25.1)
minitar (0.5.4)
mocha (0.14.0)
metaclass (~> 0.0.1)
multi_json (1.8.1)
net-scp (1.1.2)
net-ssh (>= 2.6.5)
net-ssh (2.8.0)
nokogiri (1.5.10)
pry (0.9.12.2)
coderay (~> 1.0.5)
method_source (~> 0.8)
slop (~> 3.4)
puppet (3.4.3)
facter (~> 1.6)
hiera (~> 1.0)
rgen (~> 0.6.5)
puppet-lint (0.3.2)
puppet-syntax (1.1.0)
puppet (>= 2.7.0)
rake
puppetlabs_spec_helper (0.4.1)
mocha (>= 0.10.5)
rake
rspec (>= 2.9.0)
rspec-puppet (>= 0.1.1)
rake (10.1.0)
rbvmomi (1.8.1)
builder
nokogiri (>= 1.4.1)
trollop
redcarpet (2.3.0)
rgen (0.6.6)
rspec (2.14.1)
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
rspec-core (2.14.5)
rspec-expectations (2.14.3)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.14.3)
ruby-augeas (0.5.0)
ruby-hmac (0.4.0)
serverspec (0.15.4)
highline
net-ssh
rspec (>= 2.13.0)
specinfra (>= 0.7.1)
simplecov (0.7.1)
multi_json (~> 1.0)
simplecov-html (~> 0.7.1)
simplecov-html (0.7.1)
slop (3.4.6)
specinfra (0.7.1)
thor (0.18.1)
trollop (2.0)
unf (0.1.3)
unf_ext
unf_ext (0.0.6)
vagrant-wrapper (1.2.1.1)
yard (0.8.7.2)
PLATFORMS
ruby
DEPENDENCIES
beaker!
beaker-rspec
pry
puppet (>= 2.7)
puppet-lint
puppet-syntax
puppetlabs_spec_helper (>= 0.4.1)
rake
redcarpet (~> 2.0)
rspec-puppet!
ruby-augeas (~> 0.3)
simplecov
vagrant-wrapper
yard
augeasproviders: alternative Augeas-based providers for Puppet
Copyright (c) 2012-2014 Dominic Cleal and Raphaël Pinson
Copyright (c) 2012-2016 Dominic Cleal and Raphaël Pinson
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
......
......@@ -12,6 +12,11 @@ exclude_paths = [
task :default => [:spec, :yard, :syntax, :lint]
desc "Run acceptance tests"
RSpec::Core::RakeTask.new(:acceptance) do |t|
t.pattern = 'spec/acceptance'
end
YARD::Rake::YardocTask.new do |t|
t.options = []
end
......
......@@ -24,16 +24,12 @@
{
"operatingsystem": "Ubuntu",
"operatingsystemrelease": [
"10.04",
"10.10",
"11.04",
"11.10",
"12.04",
"12.10",
"13.04",
"13.10",
"14.04",
"14.10"
"14.10",
"15.10",
"16.04"
]
},
{
......@@ -49,18 +45,7 @@
"requirements": [
{
"name": "puppet",
"version_requirement": ">= 2.7.0 < 4.0.0"
"version_requirement": ">= 2.7.0 < 5.0.0"
}
],
"puppet_version": [
"2.7",
"3.0",
"3.1",
"3.2",
"3.3",
"3.4",
"3.5",
"3.6",
"3.7"
]
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment