From 36f4efbc4565d463b5030aa613f6d0cc354adae0 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Thu, 27 Oct 2016 15:04:23 +0800 Subject: [PATCH] Bump minimum Chef versions - Leave 12.4 as metadata.rb minimum - Start testing against latest three versions - Update docs to indicate what we test RE: #503 RE: #505 --- .kitchen.yml | 41 +++++++---------------------------------- README.md | 18 ++++++------------ 2 files changed, 13 insertions(+), 46 deletions(-) diff --git a/.kitchen.yml b/.kitchen.yml index 16007179a..48081c8b7 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -45,7 +45,7 @@ suites: install_type: package - name: tarball # install by tarball - require_chef_omnibus: 12.6.0 + require_chef_omnibus: 12.15.19 run_list: - recipe[java] - recipe[elasticsearch_test::default_with_plugins] @@ -55,57 +55,30 @@ suites: - name: override_package # the override-everything use case driver_config: - require_chef_omnibus: 12.6.0 + require_chef_omnibus: 12.15.19 run_list: - recipe[java] - recipe[elasticsearch_test::package] - name: override_tarball # the override-everything use case driver_config: - require_chef_omnibus: 12.6.0 + require_chef_omnibus: 12.15.19 run_list: - recipe[java] - recipe[elasticsearch_test::tarball] - - name: chef-12.5.1 - driver_config: - require_chef_omnibus: 12.5.1 - includes: - - ubuntu-14.04 - run_list: - - recipe[java] - - recipe[elasticsearch_test::default_with_plugins] - - - name: chef-12.4.3 - driver_config: - require_chef_omnibus: 12.4.3 - includes: - - ubuntu-14.04 - run_list: - - recipe[java] - - recipe[elasticsearch_test::default_with_plugins] - - - 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 + - name: chef-12.14.89 driver_config: - require_chef_omnibus: 12.2.1 + require_chef_omnibus: 12.14.89 includes: - ubuntu-14.04 run_list: - recipe[java] - recipe[elasticsearch_test::default_with_plugins] - - name: chef-12.1.2 + - name: chef-12.13.37 driver_config: - require_chef_omnibus: 12.1.2 + require_chef_omnibus: 12.13.37 includes: - ubuntu-14.04 run_list: diff --git a/README.md b/README.md index 5e8ecde0a..9200ea583 100644 --- a/README.md +++ b/README.md @@ -2,21 +2,15 @@ [![Build Status](https://travis-ci.org/elastic/cookbook-elasticsearch.svg?branch=master)](https://travis-ci.org/elastic/cookbook-elasticsearch) [![Cookbook Version](https://img.shields.io/cookbook/v/elasticsearch.svg)](https://supermarket.chef.io/cookbooks/elasticsearch)[![Build Status](https://jenkins-01.eastus.cloudapp.azure.com/job/elasticsearch-cookbook/badge/icon)](https://jenkins-01.eastus.cloudapp.azure.com/job/elasticsearch-cookbook/) -This cookbook has been converted into a library cookbook as of version 1.0.0, -and supports Chef 12.5.1, 12.4.3, 12.3.0, 12.2.1, 12.1.2, and higher. It -implements support for 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](https://docs.chef.io/chef_search.html) in your wrapper cookbook) -or EBS device creation (use [the aws cookbook](https://github.com/chef-cookbooks/aws)). -**Previous versions** of this cookbook may be found using the git tags on this -repository. +## Pre-requisites & Supported Versions -## Pre-requisites +[Java Runtime](https://www.java.com/en/) - This cookbook requires java, but does not provide it. Please install Java before using any recipe in this cookbook. Please also note that Elasticsearch itself has specific minimum Java version requirements. We recommend [this cookbook](https://github.com/agileorbit-cookbooks/java) to install Java. -[Java Runtime](https://www.java.com/en/) - This cookbook requires java, but does not provide it. Please install -Java before using any recipe in this cookbook. Please also note that Elasticsearch itself has specific minimum Java version requirements. We recommend [this cookbook](https://github.com/agileorbit-cookbooks/java) to install Java. +[Elasticsearch](https://www.elastic.co/products/elasticsearch) - This cookbook is being written and tested to support Elasticsearch 2.x and greater. If you must have a cookbook that works with older versions of Elasticsearch, please test and then pin to a specific, older `major.minor` version of this cookbook and only leave the patch release to float. -[Elasticsearch](https://www.elastic.co/products/elasticsearch) - This cookbook is being written and tested to support Elasticsearch 2.x and greater. While this cookbook presently, by sheer luck, still works with ES 1.7.x at the time of this writing, we are not testing against versions < 2.0.0. Should Elasticsearch 2.x somehow break 1.7.x compatibility in a minor release of 2.x, this cookbook could potentially stop working with ES 1.7.x. If you must have a cookbook that works with older versions of Elasticsearch, please test and then pin to a specific `major.minor` version and only leave the patch release to float. +[Chef](https://www.chef.io/) - The latest release of this cookbook is intended to support the three most recent releases of Chef, and tests against those. Earlier versions may also be supported, though we suggest that you use Chef 12.x at a minimum. It implements support for 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](https://docs.chef.io/chef_search.html) in your wrapper cookbook) or EBS device creation (use [the aws cookbook](https://github.com/chef-cookbooks/aws)). + +**Previous versions** of this cookbook may be found using the git tags on this repository. ## Attributes