Skip to content

Commit

Permalink
Fix CI: run testing on Chef 14 and 15
Browse files Browse the repository at this point in the history
accepting the Chef EULA as non-commercial project

Signed-off-by: Artem Sidorenko <[email protected]>
  • Loading branch information
artem-sidorenko committed Jul 15, 2019
1 parent 9643c92 commit beef5e1
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
2 changes: 2 additions & 0 deletions .kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,11 @@ provisioner:
<% if ENV['CHEF_VERSION'] %>
require_chef_omnibus: <%= ENV['CHEF_VERSION'] %>
<% end %>
chef_license: accept

verifier:
name: inspec
chef_license: accept

suites:
- name: default
Expand Down
12 changes: 6 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,25 @@ cache: bundler
services:
- docker

rvm: 2.5.1
rvm: 2.6.3

env:
- INSTANCE=ubuntu-16-04 KITCHEN_LOCAL_YAML=.kitchen.do.yml
- INSTANCE=ubuntu-16-04 CHEF_VERSION=14.0.190 KITCHEN_LOCAL_YAML=.kitchen.do.yml
- INSTANCE=ubuntu-16-04 CHEF_VERSION=14.13.11 KITCHEN_LOCAL_YAML=.kitchen.do.yml
- INSTANCE=ubuntu-18-04 KITCHEN_LOCAL_YAML=.kitchen.do.yml
- INSTANCE=centos-6 KITCHEN_LOCAL_YAML=.kitchen.do.yml
- INSTANCE=centos-7 KITCHEN_LOCAL_YAML=.kitchen.do.yml
- INSTANCE=centos-7 CHEF_VERSION=14.0.190 KITCHEN_LOCAL_YAML=.kitchen.do.yml
- INSTANCE=centos-7 CHEF_VERSION=14.13.11 KITCHEN_LOCAL_YAML=.kitchen.do.yml
- INSTANCE=debian-9 KITCHEN_LOCAL_YAML=.kitchen.do.yml
- INSTANCE=fedora-28 KITCHEN_LOCAL_YAML=.kitchen.do.yml
- INSTANCE=fedora-29 KITCHEN_LOCAL_YAML=.kitchen.do.yml
- INSTANCE=ubuntu-16-04 KITCHEN_LOCAL_YAML=.kitchen.dokken.yml
- INSTANCE=ubuntu-18-04 KITCHEN_LOCAL_YAML=.kitchen.dokken.yml
- INSTANCE=ubuntu-16-04 CHEF_VERSION=14.0.190 KITCHEN_LOCAL_YAML=.kitchen.dokken.yml
- INSTANCE=ubuntu-16-04 CHEF_VERSION=14.13.11 KITCHEN_LOCAL_YAML=.kitchen.dokken.yml
- INSTANCE=ubuntu-16-04 CHEF_VERSION=current KITCHEN_LOCAL_YAML=.kitchen.dokken.yml
- INSTANCE=centos-6 KITCHEN_LOCAL_YAML=.kitchen.dokken.yml
- INSTANCE=centos-7 KITCHEN_LOCAL_YAML=.kitchen.dokken.yml
- INSTANCE=centos-7 CHEF_VERSION=14.0.190 KITCHEN_LOCAL_YAML=.kitchen.dokken.yml
- INSTANCE=centos-7 CHEF_VERSION=14.13.11 KITCHEN_LOCAL_YAML=.kitchen.dokken.yml
- INSTANCE=centos-7 CHEF_VERSION=current KITCHEN_LOCAL_YAML=.kitchen.dokken.yml
- INSTANCE=oracle-6 KITCHEN_LOCAL_YAML=.kitchen.dokken.yml
- INSTANCE=oracle-7 KITCHEN_LOCAL_YAML=.kitchen.dokken.yml
Expand All @@ -42,7 +42,7 @@ matrix:
allow_failures:
# temporaray disable failing tests until all problems are fixed
- env: INSTANCE=centos-7 KITCHEN_LOCAL_YAML=.kitchen.dokken.yml
- env: INSTANCE=centos-7 CHEF_VERSION=14.0.190 KITCHEN_LOCAL_YAML=.kitchen.dokken.yml
- env: INSTANCE=centos-7 CHEF_VERSION=14.13.11 KITCHEN_LOCAL_YAML=.kitchen.dokken.yml
- env: INSTANCE=opensuse-42 KITCHEN_LOCAL_YAML=.kitchen.dokken.yml
# allow runs with latest non-stable chef version to fail
- env: INSTANCE=ubuntu-16-04 CHEF_VERSION=current KITCHEN_LOCAL_YAML=.kitchen.dokken.yml
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ It will not:

## Requirements

* Chef >= 14.0
* Chef >= 14.13.11

### Platform

Expand Down

0 comments on commit beef5e1

Please sign in to comment.