diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000..73462a5 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.5.1 diff --git a/.travis.yml b/.travis.yml index bdfc843..943f1bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,25 +1,17 @@ sudo: required -addons: - apt: - sources: - - chef-current-trusty - packages: - - chefdk - -## Don't `bundle install` which takes about 1.5 mins -#install: echo "skip bundle install" - branches: only: - master -#services: docker +services: + - docker env: global: - - KITCHEN_YAML=.kitchen.yml - - KITCHEN_LOCAL_YAML=.kitchen.dokken.yml + - KITCHEN_YAML=kitchen.yml + - KITCHEN_LOCAL_YAML=kitchen.dokken.yml + - CHEF_LICENSE="accept-silent" matrix: - INSTANCE=default-centos-6 - INSTANCE=default-centos-7 @@ -67,17 +59,4 @@ env: - INSTANCE=unit-incorrect-gpg-fingerprint-amazonlinux-2 - INSTANCE=unit-incorrect-gpg-fingerprint-fedora-29 -before_script: -# - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER ) -# - eval "$(chef shell-init bash)" - - chef --version - - cookstyle --version - - foodcritic --version - script: kitchen verify ${INSTANCE} - -#matrix: -# include: -# - script: -# - chef exec delivery local all -#env: UNIT_AND_LINT=1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c97db0..6a89726 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,10 @@ This file is used to list changes made in each version of the aws_cloudwatch cookbook. -## 1.0.2 (2019-04.07) +## 1.0.3 (2019-12-19) +- Fix gem versions + +## 1.0.2 (2019-04-07) - Ubuntu-18.04 support ## 1.0.1 (2019-01-14) diff --git a/Gemfile b/Gemfile index 10e1d88..55922da 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,9 @@ source 'https://rubygems.org' -gem 'rspec' -gem 'chefspec' -gem 'berkshelf' \ No newline at end of file +gem 'rspec', '= 3.9.0' +gem 'chefspec', '= 9.0.0' +gem 'berkshelf', '= 7.0.8' +gem 'test-kitchen', '= 2.3.4' +gem 'kitchen-dokken', '= 2.8.1' +gem 'kitchen-vagrant', '= 1.6.0' +gem 'kitchen-inspec', '= 1.3.1' diff --git a/.kitchen.aws.yml b/kitchen.aws.yml similarity index 100% rename from .kitchen.aws.yml rename to kitchen.aws.yml diff --git a/.kitchen.dokken.yml b/kitchen.dokken.yml similarity index 100% rename from .kitchen.dokken.yml rename to kitchen.dokken.yml diff --git a/.kitchen.yml b/kitchen.yml similarity index 100% rename from .kitchen.yml rename to kitchen.yml diff --git a/metadata.rb b/metadata.rb index 2fb27e3..05ea97a 100644 --- a/metadata.rb +++ b/metadata.rb @@ -2,7 +2,7 @@ maintainer 'Gennady Potapov' license 'Apache-2.0' description 'Provides aws_cloudwatch_agent resource' -version '1.0.2' +version '1.0.3' chef_version '>= 12.14' if respond_to?(:chef_version) supports 'ubuntu', '= 14.04'