Skip to content

Commit

Permalink
Testing updates for Chef 13
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 28, 2017
1 parent 6a463a0 commit 4d2bfee
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 37 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
28 changes: 3 additions & 25 deletions .kitchen.docker.yml → .kitchen.dokken.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ transport:

provisioner:
name: dokken
deprecations_as_errors: true

verifier:
name: inspec
Expand All @@ -29,21 +30,13 @@ platforms:
- RUN /usr/bin/apt-get update
- RUN /usr/bin/apt-get install apt-transport-https lsb-release procps net-tools -y

- name: centos-5
driver:
image: centos:5
platform: rhel
pid_one_command: /sbin/init
intermediate_instructions:
- RUN yum install -y which initscripts net-tools wget

- name: centos-6
driver:
image: centos:6
platform: rhel
pid_one_command: /sbin/init
intermediate_instructions:
- RUN yum -y install which initscripts net-tools wget
- RUN yum -y install lsof which initscripts net-tools wget net-tools

- name: centos-7
driver:
Expand All @@ -58,15 +51,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

- name: ubuntu-12.04
driver:
image: ubuntu-upstart:12.04
pid_one_command: /sbin/init
intermediate_instructions:
- RUN /usr/bin/apt-get update
- RUN /usr/bin/apt-get install apt-transport-https lsb-release procps net-tools -y
- RUN dnf -y install which systemd-sysv initscripts wget net-tools

- name: ubuntu-14.04
driver:
Expand All @@ -84,13 +69,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
12 changes: 3 additions & 9 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

verifier:
name: inspec
Expand All @@ -14,22 +15,16 @@ platforms:
run_list: apt::default
- name: debian-8.6
run_list: apt::default
- name: freebsd-9.3
run_list: freebsd::portsnap
- name: freebsd-10.3
run_list: freebsd::portsnap
- name: freebsd-11.0
run_list: freebsd::portsnap
- name: fedora-25
- name: opensuse-13.2
- name: opensuse-leap-42.2
- name: ubuntu-14.04
run_list: apt::default
- name: ubuntu-16.04
run_list: apt::default
- name: macosx-10.10
run_list: homebrew::default
driver:
box: chef/macosx-10.10 # private box in Chef's Atlas account
provider: vmware_fusion
- name: macosx-10.11
run_list: homebrew::default
driver:
Expand All @@ -42,5 +37,4 @@ suites:
- name: iptables
run_list: openssh::iptables
excludes:
- macosx-10.10
- macosx-10.11
4 changes: 1 addition & 3 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 All @@ -27,7 +26,6 @@ env:
# - INSTANCE=default-fedora-latest # fails due to missing ssh keys in the docker instance
- INSTANCE=default-centos-6
- INSTANCE=default-centos-7
- INSTANCE=default-opensuse-132
- INSTANCE=default-opensuse-leap

before_script:
Expand All @@ -37,7 +35,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 4d2bfee

Please sign in to comment.