Skip to content

Commit

Permalink
Testing updates
Browse files Browse the repository at this point in the history
Signed-off-by: Tim Smith <[email protected]>
  • Loading branch information
tas50 committed Oct 7, 2019
1 parent 69fe590 commit b530126
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 19 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ env:
- INSTANCE=resources-ubuntu-1604
- INSTANCE=resources-ubuntu-1804

# Ensure we make ChefDK's Ruby the default
before_script:
- sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
- eval "$(chef shell-init bash)"
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This gemfile provides additional gems for testing and releasing this cookbook
# It is meant to be installed on top of ChefDK which provides the majority
# It is meant to be installed on top of ChefDK / Chef Workstation which provide the majority
# of the necessary gems for testing this cookbook
#
# Run 'chef exec bundle install' to install these dependencies
Expand Down
16 changes: 1 addition & 15 deletions chefignore
Original file line number Diff line number Diff line change
Expand Up @@ -45,22 +45,19 @@ a.out

# Testing #
###########
.watchr
.rspec
spec/*
spec/fixtures/*
test/*
features/*
examples/*
Guardfile
Procfile
.kitchen*
.rubocop.yml
spec/*
Rakefile
.travis.yml
.foodcritic
.codeclimate.yml
appveyor.yml

# SCM #
#######
Expand Down Expand Up @@ -93,14 +90,3 @@ CONTRIBUTING*
CHANGELOG*
TESTING*

# Strainer #
############
Colanderfile
Strainerfile
.colander
.strainer

# Vagrant #
###########
.vagrant
Vagrantfile
12 changes: 10 additions & 2 deletions kitchen.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
---
driver:
name: dokken
chef_version: latest
privileged: true
privileged: true # because Docker and SystemD/Upstart
chef_version: <%= ENV['CHEF_VERSION'] || 'current' %>
chef_license: accept-no-persist
volumes: [
'/var/lib/docker', '/var/lib/docker-one', '/var/lib/docker-two'
]
Expand All @@ -13,6 +14,7 @@ transport:
provisioner:
name: dokken
deprecations_as_errors: true
chef_license: accept-no-persist

verifier:
name: inspec
Expand All @@ -32,11 +34,15 @@ platforms:
driver:
image: dokken/debian-8
pid_one_command: /bin/systemd
intermediate_instructions:
- RUN /usr/bin/apt-get update

- name: debian-9
driver:
image: dokken/debian-9
pid_one_command: /bin/systemd
intermediate_instructions:
- RUN /usr/bin/apt-get update

- name: centos-7
driver:
Expand All @@ -52,6 +58,8 @@ platforms:
driver:
image: dokken/ubuntu-16.04
pid_one_command: /bin/systemd
intermediate_instructions:
- RUN /usr/bin/apt-get update

- name: ubuntu-18.04
driver:
Expand Down

0 comments on commit b530126

Please sign in to comment.