Merge pull request #203 from hunner/update_travis

Update specs for current testing practices and GH publish
This commit is contained in:
Hunter Haugen 2013-06-26 14:39:44 -07:00
commit 1610add58c
4 changed files with 30 additions and 16 deletions

View file

@ -1,6 +1,5 @@
fixtures: fixtures:
repositories: repositories:
"stdlib": "git://github.com/puppetlabs/puppetlabs-stdlib" "stdlib": "git://github.com/puppetlabs/puppetlabs-stdlib"
"create_resources": "git://github.com/puppetlabs/puppetlabs-create_resources.git"
symlinks: symlinks:
"mysql": "#{source_dir}" "mysql": "#{source_dir}"

1
.gitignore vendored
View file

@ -1,2 +1,3 @@
*.swp *.swp
pkg/ pkg/
Gemfile.lock

View file

@ -1,28 +1,39 @@
branches:
only:
- master
language: ruby language: ruby
bundler_args: --without development bundler_args: --without development
before_script:
- "[ $PUPPET_GEM_VERSION ~> 2.6 ] && git clone git://github.com/puppetlabs/puppetlabs-create_resources.git spec/fixtures/modules/create_resources || true"
script: "bundle exec rake spec SPEC_OPTS='--format documentation'" script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
after_success:
- git clone -q git://github.com/puppetlabs/ghpublisher.git .forge-release
- .forge-release/publish
rvm: rvm:
- 1.8.7 - 1.8.7
- 1.9.3 - 1.9.3
- ruby-head - 2.0.0
env: env:
- PUPPET_GEM_VERSION="~> 2.6.0" matrix:
- PUPPET_GEM_VERSION="~> 2.7.0" - PUPPET_GEM_VERSION="~> 2.7.0"
- PUPPET_GEM_VERSION="~> 3.0.0" - PUPPET_GEM_VERSION="~> 3.0.0"
- PUPPET_GEM_VERSION="~> 3.1.0" - PUPPET_GEM_VERSION="~> 3.1.0"
- PUPPET_GEM_VERSION="~> 3.2.0"
global:
- PUBLISHER_LOGIN=puppetlabs
- secure: |-
Hc9OPm/kRTmjXSP3TbLir/y6Yy1LqmZS8zrqxdTbpo3Z04EYv1uKhaFDpECl
0a6bJRUWpLWIuDco08fHMeCTWoFGzE97EDelhHKSYiTNllzYKWPHy7ki/al6
wjz0gLtiDfmktHQOHatBy6EKLFjoyjGoE4cUUta4Ixq4tMBNzEA=
matrix: matrix:
allow_failures:
- rvm: ruby-head
exclude: exclude:
- rvm: 1.9.3 - rvm: 1.9.3
env: PUPPET_GEM_VERSION="~> 2.7.0" env: PUPPET_GEM_VERSION="~> 2.7.0"
- rvm: ruby-head - rvm: 2.0.0
env: PUPPET_GEM_VERSION="~> 2.7.0" env: PUPPET_GEM_VERSION="~> 2.7.0"
- rvm: 1.9.3 - rvm: 2.0.0
env: PUPPET_GEM_VERSION="~> 2.6.0" env: PUPPET_GEM_VERSION="~> 3.0.0"
- rvm: ruby-head - rvm: 2.0.0
env: PUPPET_GEM_VERSION="~> 2.6.0" env: PUPPET_GEM_VERSION="~> 3.1.0"
- rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 3.2.0"
notifications: notifications:
email: false email: false

View file

@ -1,7 +1,10 @@
source :rubygems source 'https://rubygems.org'
group :development, :test do group :development, :test do
gem 'rake', :require => false
gem 'rspec-puppet', :require => false
gem 'puppetlabs_spec_helper', :require => false gem 'puppetlabs_spec_helper', :require => false
gem 'puppet-lint', :require => false
end end
if puppetversion = ENV['PUPPET_GEM_VERSION'] if puppetversion = ENV['PUPPET_GEM_VERSION']