Skip to content

Commit

Permalink
update travis configuration, use chef 13 as default
Browse files Browse the repository at this point in the history
  • Loading branch information
chris-rock committed Jun 29, 2017
1 parent ba845f8 commit 8e7daac
Show file tree
Hide file tree
Showing 4 changed files with 59 additions and 10 deletions.
8 changes: 8 additions & 0 deletions .kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,3 +132,11 @@ suites:
collector: json-file
inspec_version: 1.19.1
fail_if_not_present: true
- name: chef-12-test
run_list:
- recipe[audit::default]
attributes:
audit:
collector: json-file
inspec_version: 1.25.1
fail_if_not_present: true
24 changes: 15 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,30 +14,36 @@ before_install:
- gem --version
matrix:
include:
- rvm: 2.2
- rvm: 2.3.3
script: bundle exec rake
- rvm: 2.3.1
- rvm: 2.3.3
script: bundle exec rake $SUITE
env: SUITE=test:integration OS='default-centos-7'
- rvm: 2.3.1
- rvm: 2.3.3
script: bundle exec rake $SUITE
env: SUITE=test:integration OS='default-ubuntu-1404'
- rvm: 2.3.1
- rvm: 2.3.3
script: bundle exec rake $SUITE
env: SUITE=test:integration OS='missing-profile-no-fail-ubuntu-1404'
- rvm: 2.3.1
- rvm: 2.3.3
script: bundle exec rake $SUITE && exit 1 || echo "OK"
env: SUITE=test:integration OS='missing-profile-fail-ubuntu-1404'
- rvm: 2.3.1
- rvm: 2.3.3
script: bundle exec rake $SUITE
env: SUITE=test:integration OS='gem-install-version-centos-7'
- rvm: 2.3.1
- rvm: 2.3.3
script: bundle exec rake $SUITE
env: SUITE=test:integration OS='gem-install-version-ubuntu-1404'
- rvm: 2.3.1
- rvm: 2.3.3
script: bundle exec rake $SUITE
env: SUITE=test:integration OS='skip-inspec-gem-install-ubuntu-1404'
- rvm: 2.3.1
# chef 12 testing
- rvm: 2.3.3
gemfile: gemfiles/Gemfile.chef12
script: bundle exec rake $SUITE
env: SUITE=test:integration OS='chef-12-test'
# integration test with automate
- rvm: 2.3.3
env: SUITE=test:kitchen_automate
before_install:
- echo -n $EC2_KEY_CHUNK_{0..24} >> ~/.ssh/kitchen-key-compliance.base64
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

gem 'chef', '>= 12.5.1'
gem 'chef', '~> 13.1.31'

if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2.2')
gem 'json', '~> 1.8'
Expand Down
35 changes: 35 additions & 0 deletions Gemfile.chef12
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
source 'https://rubygems.org'

gem 'chef', '~> 12'

if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2.2')
gem 'json', '~> 1.8'
gem 'rack', '< 2.0'
gem 'fauxhai', '< 3.10'
end

group :style do
gem 'foodcritic', '~> 11.0'
gem 'cookstyle', '~> 1.3'
end

group :test do
gem 'rake', '>= 11.3'
gem 'berkshelf', '>= 5.6'
gem 'chefspec', '~> 7.0'
gem 'coveralls', '~> 0.8.2', require: false
gem 'rb-readline'
gem 'webmock'
end

group :integration do
gem 'test-kitchen', '~> 1.16'
gem 'kitchen-dokken'
gem 'kitchen-ec2', '~> 1.2'
gem 'kitchen-inspec', '~> 0.18'
end

group :release do
gem 'github_changelog_generator', '~> 1'
gem 'stove'
end

0 comments on commit 8e7daac

Please sign in to comment.