From e02959c414aa924a3f8fe3a3afcb66f1bd7fd780 Mon Sep 17 00:00:00 2001
From: Tim Smith <tsmith@chef.io>
Date: Fri, 28 Jul 2017 09:28:57 -0700
Subject: [PATCH] Update test configs

Signed-off-by: Tim Smith <tsmith@chef.io>
---
 .kitchen.dokken.yml | 84 +++++++++++++--------------------------------
 .kitchen.yml        | 10 +++++-
 .travis.yml         |  4 ++-
 chefignore          |  5 +++
 4 files changed, 40 insertions(+), 63 deletions(-)

diff --git a/.kitchen.dokken.yml b/.kitchen.dokken.yml
index 0227c09..8154d1c 100644
--- a/.kitchen.dokken.yml
+++ b/.kitchen.dokken.yml
@@ -1,115 +1,77 @@
 driver:
   name: dokken
   privileged: true # because Docker and SystemD/Upstart
-  chef_version: current
+  chef_version: <%= ENV['CHEF_VERSION'] || 'current' %>
 
 transport:
   name: dokken
 
 provisioner:
   name: dokken
+  deprecations_as_errors: true
 
 verifier:
-  root_path: '/opt/verifier'
-  sudo: false
+  name: inspec
 
 platforms:
+- name: amazonlinux
+  driver:
+    image: dokken/amazonlinux
+    pid_one_command: /sbin/init
+
 - name: debian-7
   driver:
-    image: debian:7
+    image: dokken/debian-7
     pid_one_command: /sbin/init
     intermediate_instructions:
       - RUN /usr/bin/apt-get update
-      - RUN /usr/bin/apt-get install lsb-release procps -y
 
 - name: debian-8
   driver:
-    image: debian:8
+    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
-      - RUN /usr/bin/apt-get install lsb-release -y
 
 - name: centos-6
   driver:
-    image: centos:6
+    image: dokken/centos-6
     platform: rhel
     pid_one_command: /sbin/init
-    intermediate_instructions:
-      - RUN yum -y install which initscripts
 
 - name: centos-7
   driver:
-    image: centos:7
+    image: dokken/centos-7
     platform: rhel
     pid_one_command: /usr/lib/systemd/systemd
-    intermediate_instructions:
-      - RUN yum -y install lsof which systemd-sysv initscripts
 
 - name: fedora-latest
   driver:
-    image: fedora:latest
+    image: dokken/fedora-latest
     pid_one_command: /usr/lib/systemd/systemd
-    intermediate_instructions:
-      - RUN dnf -y install which systemd-sysv initscripts
 
 - name: ubuntu-14.04
   driver:
-    image: ubuntu-upstart:14.04
+    image: dokken/ubuntu-14.04
     pid_one_command: /sbin/init
     intermediate_instructions:
       - RUN /usr/bin/apt-get update
 
 - name: ubuntu-16.04
   driver:
-    image: ubuntu:16.04
+    image: dokken/ubuntu-16.04
     pid_one_command: /bin/systemd
     intermediate_instructions:
       - RUN /usr/bin/apt-get update
 
 - name: opensuse-leap
   driver:
-    image: opensuse:leap
+    image: dokken/opensuse-leap
     pid_one_command: /bin/systemd
-    intermediate_instructions:
-      - RUN zypper --non-interactive install aaa_base perl-Getopt-Long-Descriptive which hostname
-
-suites:
-- name: default
-  run_list:
-  - recipe[postfix]
-
-- name: aliases
-  run_list:
-  - recipe[postfix::aliases]
-
-- name: client
-  run_list:
-  - recipe[postfix::client]
-
-- name: server
-  run_list:
-  - recipe[postfix::server]
-  attributes:
-    postfix:
-      use_relay_restrictions_maps: "yes"
-
-- name: sasl_auth
-  run_list:
-  - recipe[postfix::sasl_auth]
-  attributes:
-    postfix:
-      main:
-        relayhost: "localhost"
-        smtp_sasl_auth_enable: "yes"
-      sasl:
-        smtp_sasl_user_name: "kitchenuser"
-        smtp_sasl_passwd: "not-a-real-thing"
-
-- name: canonical
-  run_list:
-  - recipe[postfix]
-  attributes:
-    postfix:
-      recipient_canonical_map_entries:
-        john: john@doe.com
\ No newline at end of file
diff --git a/.kitchen.yml b/.kitchen.yml
index fcd3387..a109c39 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -3,16 +3,24 @@ driver:
 
 provisioner:
   name: chef_zero
+  deprecations_as_errors: true
+
+verifier:
+  name: inspec
 
 platforms:
+  - name: amazon-linux
+    driver_config:
+      box: mvbcoding/awslinux
   - name: centos-6.9
   - name: centos-7.3
   - name: debian-7.11
     run_list: apt::default
   - name: debian-8.8
     run_list: apt::default
+  - name: debian-9.0
+    run_list: apt::default
   - name: fedora-25
-  - name: opensuse-13.2
   - name: opensuse-leap-42.2
   - name: ubuntu-14.04
     run_list: apt::default
diff --git a/.travis.yml b/.travis.yml
index 6829c65..a4038d5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,12 +21,14 @@ env:
   matrix:
   - INSTANCE=default-centos-6
   - INSTANCE=default-centos-7
+  - INSTANCE=default-debian-8
+  - INSTANCE=default-debian-9
   - INSTANCE=default-ubuntu-1404
   - INSTANCE=default-ubuntu-1604
   - INSTANCE=canonical-centos-6
   - INSTANCE=canonical-centos-7
-  - INSTANCE=canonical-debian-7
   - INSTANCE=canonical-debian-8
+  - INSTANCE=canonical-debian-9
   - INSTANCE=canonical-ubuntu-1404
   - INSTANCE=canonical-ubuntu-1604
 
diff --git a/chefignore b/chefignore
index a976917..38e7379 100644
--- a/chefignore
+++ b/chefignore
@@ -82,6 +82,11 @@ Berksfile.lock
 cookbooks/*
 tmp
 
+# Policyfile #
+##############
+Policyfile.rb
+Policyfile.lock.json
+
 # Cookbooks #
 #############
 CONTRIBUTING*