Skip to content

Commit

Permalink
Changes based on feedback
Browse files Browse the repository at this point in the history
Signed-off-by: Alex Pop <[email protected]>
  • Loading branch information
Alex Pop authored and alexpop committed Mar 2, 2020
1 parent 1b54436 commit dddb495
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 21 deletions.
33 changes: 15 additions & 18 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,62 +28,59 @@ before_install:
- CHEF_LICENSE="accept-no-persist" sudo chef gem install webmock
- eval "$(chef shell-init bash)"
- chef --version
- cookstyle --version
- foodcritic --version
- kitchen --version
- kitchen list

matrix:
include:
# Run the style, unit and chefspec tests
- rvm: 2.6.3
- rvm: 2.6.5
script: rake
# Run integration tests with test-kitchen
- rvm: 2.6.3
- rvm: 2.6.5
script: rake $SUITE
env: SUITE=test:integration OS='default-centos-7'
- rvm: 2.6.3
- rvm: 2.6.5
script: rake $SUITE
env: SUITE=test:integration OS='default-ubuntu-1804'
- rvm: 2.6.3
- rvm: 2.6.5
script: rake $SUITE
env: SUITE=test:integration OS='missing-profile-no-fail-ubuntu-1804'
- rvm: 2.6.3
- rvm: 2.6.5
script: rake $SUITE && exit 1 || echo "OK"
env: SUITE=test:integration OS='missing-profile-fail-ubuntu-1804'

# Next 5 suites are disabled due to an issue with the gem() inspec resource
# see https://github.com/chef-cookbooks/audit/issues/406
#
# - rvm: 2.6.3
# - rvm: 2.6.5
# script: rake $SUITE
# env: SUITE=test:integration OS='chef15-compatible-inspec-ubuntu-1804'
# Next 4 suites test running inspec 3 or 4 on audit cookbook. This is only permitted on chef 14 or older.
# - rvm: 2.6.3
# - rvm: 2.6.5
# script: rake $SUITE
# env: SUITE=test:integration OS='gem-install-core-version4-centos-7' CHEF_VERSION=14
# - rvm: 2.6.3
# - rvm: 2.6.5
# script: rake $SUITE
# env: SUITE=test:integration OS='gem-install-core-version3-centos-7' CHEF_VERSION=14
# - rvm: 2.6.3
# - rvm: 2.6.5
# script: rake $SUITE
# env: SUITE=test:integration OS='gem-install-core-version4-ubuntu-1804' CHEF_VERSION=14
# - rvm: 2.6.3
# - rvm: 2.6.5
# script: rake $SUITE
# env: SUITE=test:integration OS='gem-install-core-version3-ubuntu-1804' CHEF_VERSION=14

- rvm: 2.6.3
- rvm: 2.6.5
script: rake $SUITE
env: SUITE=test:integration OS='inspec-attributes-ubuntu-1804'
- rvm: 2.6.3
- rvm: 2.6.5
script: rake $SUITE
env: SUITE=test:integration OS='chef-node-enabled-ubuntu-1804'
- rvm: 2.6.3
- rvm: 2.6.5
script: rake $SUITE
env: SUITE=test:integration OS='chef-node-disabled-ubuntu-1804'
- rvm: 2.6.3
- rvm: 2.6.5
script: rake $SUITE
env: SUITE=test:integration OS='hash-centos-7'
- rvm: 2.6.3
- rvm: 2.6.5
script: rake $SUITE
env: SUITE=test:integration OS='hash-ubuntu-1804'
3 changes: 0 additions & 3 deletions libraries/matchers.rb

This file was deleted.

0 comments on commit dddb495

Please sign in to comment.