Skip to content

Commit

Permalink
Test against many chef 12.x versions, include DSL
Browse files Browse the repository at this point in the history
Make sure the recipe DSL is available for the install provider, which needs to `include_recipe` for ark and curl.

Fixes #371. Fixes #372.
  • Loading branch information
martinb3 committed Sep 20, 2015
1 parent d43dfc9 commit 35e791e
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 4 deletions.
33 changes: 30 additions & 3 deletions .kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
driver:
name: vagrant # provide a default test-kitchen driver, vagrant

driver_config:
require_chef_omnibus: true # 11.18.12

provisioner:
name: chef_zero
nodes_path: 'test/fixtures/nodes'
Expand All @@ -36,11 +33,41 @@ platforms:

suites:
- name: default # the normal use-case
require_chef_omnibus: 12.4.1
run_list:
- recipe[java]
- recipe[elasticsearch_test::default_with_plugins]

- name: elasticsearch_test # the override-everything use case
driver_config:
require_chef_omnibus: 12.4.1
run_list:
- recipe[java]
- recipe[elasticsearch_test::default]

- name: chef-12.3.0
driver_config:
require_chef_omnibus: 12.3.0
includes:
- ubuntu-14.04
run_list:
- recipe[java]
- recipe[elasticsearch_test::default_with_plugins]

- name: chef-12.2.1
driver_config:
require_chef_omnibus: 12.2.1
includes:
- ubuntu-14.04
run_list:
- recipe[java]
- recipe[elasticsearch_test::default_with_plugins]

- name: chef-12.1.2
driver_config:
require_chef_omnibus: 12.1.2
includes:
- ubuntu-14.04
run_list:
- recipe[java]
- recipe[elasticsearch_test::default_with_plugins]
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Elasticsearch Chef Cookbook

This cookbook has been converted into a library cookbook as of version 1.0.0,
and supports Chef 12.x and higher. It implements supports CI as well as more
and supports Chef 12.4.1, 12.3.0, 12.2.1, and higher. It implements supports CI as well as more
modern testing with chefspec and test-kitchen. It no longer supports some of
the more extraneous features such as discovery (use [chef search](http://docs.chef.io/chef_search.html)
in your wrapper cookbook) or EBS device creation (use
Expand Down
1 change: 1 addition & 0 deletions libraries/provider_install.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ class Chef
# downloaded from elasticsearch.org and installed by package manager or ark resource
class Provider::ElasticsearchInstall < Chef::Provider::LWRPBase
include ElasticsearchCookbook::Helpers
include Chef::DSL::IncludeRecipe
provides :elasticsearch_install if respond_to?(:provides)

action :install do
Expand Down

0 comments on commit 35e791e

Please sign in to comment.