Skip to content
This repository has been archived by the owner on Jun 18, 2019. It is now read-only.

Commit

Permalink
Upgrade test harness.
Browse files Browse the repository at this point in the history
  • Loading branch information
coderanger committed Jan 29, 2016
1 parent 143e277 commit e8a88fe
Show file tree
Hide file tree
Showing 17 changed files with 116 additions and 38 deletions.
9 changes: 0 additions & 9 deletions .kitchen.travis.yml

This file was deleted.

8 changes: 1 addition & 7 deletions .kitchen.yml
@@ -1,9 +1,3 @@
---
#<% require 'poise_boiler' %>
<%= PoiseBoiler.kitchen(platforms: 'linux') %>

suites:
- name: default
run_list:
- recipe[poise-ruby_test]
- recipe[poise-ruby_test::bundle_install]
<%= PoiseBoiler.kitchen %>
12 changes: 6 additions & 6 deletions .travis.yml
@@ -1,20 +1,20 @@
sudo: false
cache: bundler
language: ruby
addons:
apt:
packages:
- libgecode-dev
rvm:
- '2.2'
env:
global:
- USE_SYSTEM_GECODE=true
- KITCHEN_LOCAL_YAML=.kitchen.travis.yml
- secure: YOM++OBAaAhRGG4IkODRzmscd0JAW1w5jnfTcpF1nV9pGFEicFGGneHANzT2FdNl/xU2BDzoQd46Wv5rSPb0C+Kw00qYyadTsyWaVVggHL60FLFWGpnFq29iApHnKA+HX5qoKGgtW5ZPczJlwumuZvr+pgstUOVYTk/RJqFy+vw=
bundler_args: "--binstubs=$PWD/bin --jobs 3 --retry 3"
script:
- "./bin/rake travis"
gemfile:
- test/gemfiles/chef-12.gemfile
- test/gemfiles/chef-12.1.gemfile
- test/gemfiles/chef-12.2.gemfile
- test/gemfiles/chef-12.3.gemfile
- test/gemfiles/chef-12.4.gemfile
- test/gemfiles/chef-12.5.gemfile
- test/gemfiles/chef-12.6.gemfile
- test/gemfiles/master.gemfile
1 change: 1 addition & 0 deletions Gemfile
Expand Up @@ -31,3 +31,4 @@ dev_gem 'halite'
dev_gem 'poise'
dev_gem 'poise-boiler'
dev_gem 'poise-languages'
dev_gem 'poise-profiler'
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -29,7 +29,7 @@ end

## Requirements

Chef 12 or newer is required.
Chef 12.1 or newer is required.

## Attributes

Expand Down
2 changes: 1 addition & 1 deletion poise-ruby.gemspec
Expand Up @@ -37,5 +37,5 @@ Gem::Specification.new do |spec|
spec.add_dependency 'poise', '~> 2.0'
spec.add_dependency 'poise-languages', '~> 1.2'

spec.add_development_dependency 'poise-boiler', '~> 1.0'
spec.add_development_dependency 'poise-boiler', '~> 1.6'
end
Expand Up @@ -16,4 +16,3 @@

name 'poise-ruby_test'
depends 'poise-ruby'
depends 'build-essential'
Expand Up @@ -16,7 +16,11 @@

require 'poise_ruby/resources/ruby_runtime_test'

include_recipe 'build-essential'
# Poor man's build-essential.
package value_for_platform_family(
debian: %w{autoconf binutils-doc bison build-essential flex gettext ncurses-dev},
rhel: %w{autoconf bison flex gcc gcc-c++ kernel-devel make m4 patch},
)

# Install lsb-release because Debian 6 doesn't by default and serverspec requires it
package 'lsb-release' if platform?('debian') && node['platform_version'].start_with?('6')
Expand All @@ -38,3 +42,5 @@
else
file '/no_scl'
end

include_recipe '::bundle_install'
13 changes: 2 additions & 11 deletions Berksfile → test/gemfiles/chef-12.1.gemfile
Expand Up @@ -14,15 +14,6 @@
# limitations under the License.
#

source 'https://supermarket.chef.io/'
extension 'halite'
eval_gemfile File.expand_path('../../../Gemfile', __FILE__)

# Force the rebuild every time for development.
cookbook 'poise', gem: 'poise'
cookbook 'poise-languages', gem: 'poise-languages'
cookbook 'poise-ruby', gem: 'poise-ruby'

group :test do
cookbook 'poise-ruby_test', path: 'test/cookbooks/poise-ruby_test'
cookbook 'apt'
end
gem 'chef', '~> 12.1.2'
19 changes: 19 additions & 0 deletions test/gemfiles/chef-12.2.gemfile
@@ -0,0 +1,19 @@
#
# Copyright 2015, Noah Kantrowitz
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

eval_gemfile File.expand_path('../../../Gemfile', __FILE__)

gem 'chef', '~> 12.2.1'
19 changes: 19 additions & 0 deletions test/gemfiles/chef-12.3.gemfile
@@ -0,0 +1,19 @@
#
# Copyright 2015, Noah Kantrowitz
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

eval_gemfile File.expand_path('../../../Gemfile', __FILE__)

gem 'chef', '~> 12.3.0'
19 changes: 19 additions & 0 deletions test/gemfiles/chef-12.4.gemfile
@@ -0,0 +1,19 @@
#
# Copyright 2015, Noah Kantrowitz
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

eval_gemfile File.expand_path('../../../Gemfile', __FILE__)

gem 'chef', '~> 12.4.3'
19 changes: 19 additions & 0 deletions test/gemfiles/chef-12.5.gemfile
@@ -0,0 +1,19 @@
#
# Copyright 2015, Noah Kantrowitz
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

eval_gemfile File.expand_path('../../../Gemfile', __FILE__)

gem 'chef', '~> 12.5.1'
19 changes: 19 additions & 0 deletions test/gemfiles/chef-12.6.gemfile
@@ -0,0 +1,19 @@
#
# Copyright 2015, Noah Kantrowitz
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

eval_gemfile File.expand_path('../../../Gemfile', __FILE__)

gem 'chef', '~> 12.6.0'
2 changes: 1 addition & 1 deletion test/gemfiles/chef-12.gemfile
Expand Up @@ -16,4 +16,4 @@

eval_gemfile File.expand_path('../../../Gemfile', __FILE__)

gem 'chef', '~> 12.0'
gem 'chef', '~> 12.6'
1 change: 1 addition & 0 deletions test/gemfiles/master.gemfile
Expand Up @@ -21,3 +21,4 @@ gem 'halite', github: 'poise/halite'
gem 'poise', github: 'poise/poise'
gem 'poise-boiler', github: 'poise/poise-boiler'
gem 'poise-languages', github: 'poise/poise-languages'
gem 'poise-profiler', github: 'poise/poise-profiler'

0 comments on commit e8a88fe

Please sign in to comment.