Skip to content
This repository has been archived by the owner on Jan 19, 2019. It is now read-only.

Commit

Permalink
Testing updates
Browse files Browse the repository at this point in the history
Signed-off-by: Tim Smith <tsmith@chef.io>
  • Loading branch information
tas50 committed Feb 27, 2017
1 parent 21e84e8 commit b0d5a08
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 12 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ vendor/
.coverage/
.zero-knife.rb
Policyfile.lock.json
Cheffile.lock
.librarian/

# vagrant stuff
.vagrant/
Expand Down
9 changes: 1 addition & 8 deletions .kitchen.docker.yml → .kitchen.dokken.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ platforms:
image: fedora:latest
pid_one_command: /usr/lib/systemd/systemd
intermediate_instructions:
- RUN dnf -y install yum which systemd-sysv initscripts wget net-tools
- RUN dnf -y install which systemd-sysv initscripts wget net-tools

- name: ubuntu-14.04
driver:
Expand All @@ -70,13 +70,6 @@ platforms:
- RUN /usr/bin/apt-get update
- RUN /usr/bin/apt-get install apt-transport-https lsb-release procps net-tools -y

- name: opensuse-13.2
driver:
image: opensuse:13.2
pid_one_command: /bin/systemd
intermediate_instructions:
- RUN zypper --non-interactive install aaa_base perl-Getopt-Long-Descriptive which net-tools

- name: opensuse-leap
driver:
image: opensuse:leap
Expand Down
6 changes: 4 additions & 2 deletions .kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ driver:

provisioner:
name: chef_zero
deprecations_as_errors: true

platforms:
- name: centos-6.8
Expand All @@ -12,13 +13,14 @@ platforms:
- name: debian-8.6
run_list: apt::default
- name: fedora-25
- name: opensuse-leap-42.2
- name: ubuntu-14.04
run_list: apt::default
- name: ubuntu-16.04
run_list: apt::default
- name: freebsd-9.3
- name: freebsd-10.3

- name: freebsd-11.0

suites:
- name: default
run_list:
Expand Down
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
sudo: required
dist: trusty

# install the pre-release chef-dk. Use chef-stable-trusty to install the stable release
addons:
apt:
sources:
Expand Down Expand Up @@ -33,7 +32,7 @@ before_script:
- /opt/chefdk/embedded/bin/cookstyle --version
- /opt/chefdk/embedded/bin/foodcritic --version

script: KITCHEN_LOCAL_YAML=.kitchen.docker.yml /opt/chefdk/embedded/bin/kitchen verify ${INSTANCE}
script: KITCHEN_LOCAL_YAML=.kitchen.dokken.yml /opt/chefdk/embedded/bin/kitchen verify ${INSTANCE}

matrix:
include:
Expand Down

0 comments on commit b0d5a08

Please sign in to comment.