From 3fa691c556010e1a8fb45a6714a7dbf708a7a938 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Wed, 12 Feb 2020 23:06:15 +0000
Subject: [PATCH] Enable remaining test-kitchen suites in travis

---
 .kitchen.yml | 13 -------------
 .travis.yml  | 45 ++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 42 insertions(+), 16 deletions(-)

diff --git a/.kitchen.yml b/.kitchen.yml
index e060fe1b6..faf16e69a 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -26,11 +26,9 @@ suites:
   - name: accounts
     run_list:
       - recipe[accounts::default]
-    excludes: ["ubuntu-18.04"]
   - name: apache
     run_list:
       - recipe[apache::default]
-    excludes: ["ubuntu-18.04"]
   - name: apt
     run_list:
       - recipe[apt::default]
@@ -40,17 +38,14 @@ suites:
     attributes:
       bind:
         clients: none
-    excludes: ["ubuntu-18.04"]
   - name: blogs
     run_list:
       - recipe[accounts::default]
       - recipe[blogs::default]
-    excludes: ["ubuntu-18.04"]
   - name: forum
     run_list:
       - recipe[accounts::default]
       - role[forum]
-    excludes: ["ubuntu-18.04"]
   - name: letsencrypt
     run_list:
       - recipe[accounts::default]
@@ -60,34 +55,26 @@ suites:
       apt:
         sources:
           - openstreetmap
-    excludes: ["ubuntu-18.04"]
   - name: munin
     run_list:
       - recipe[munin::default]
-    excludes: ["ubuntu-18.04"]
   - name: munin-server
     run_list:
       - recipe[munin::server]
-    excludes: ["ubuntu-18.04"]
   - name: mysql
     run_list:
       - recipe[mysql::default]
-    excludes: ["ubuntu-18.04"]
   - name: networking
     run_list:
       - recipe[networking::default]
-    excludes: ["ubuntu-18.04"]
   - name: otrs
     run_list:
       - recipe[accounts::default]
       - recipe[chef::default]
       - role[otrs]
-    excludes: ["ubuntu-18.04"]
   - name: python
     run_list:
       - recipe[python::default]
-    excludes: ["ubuntu-18.04"]
   - name: tools
     run_list:
       - recipe[tools::default]
-    excludes: ["ubuntu-18.04"]
diff --git a/.travis.yml b/.travis.yml
index a0d25a1b7..deb00f9e1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,46 @@ jobs:
   include:
     - name: "Cookstyle"
       script:
-      - bundle exec cookstyle -f fuubar
-    - name: "Kitchen Test Apt Cookbook"
+        - bundle exec cookstyle -f fuubar
+    - name: "Test Kitchen (accounts)"
       script:
-      - bundle exec kitchen test apt-ubuntu-1804
+        - bundle exec kitchen test accounts-ubuntu-1804
+    - name: "Test Kitchen (apache)"
+      script:
+        - bundle exec kitchen test apache-ubuntu-1804
+    - name: "Test Kitchen (apt)"
+      script:
+        - bundle exec kitchen test apt-ubuntu-1804
+    - name: "Test Kitchen (bind)"
+      script:
+        - bundle exec kitchen test bind-ubuntu-1804
+    - name: "Test Kitchen (blogs)"
+      script:
+        - bundle exec kitchen test blogs-ubuntu-1804
+    - name: "Test Kitchen (forum)"
+      script:
+        - bundle exec kitchen test forum-ubuntu-1804
+    - name: "Test Kitchen (letsencrypt)"
+      script:
+        - bundle exec kitchen test letsencrypt-ubuntu-1804
+    - name: "Test Kitchen (munin)"
+      script:
+        - bundle exec kitchen test munin-ubuntu-1804
+    - name: "Test Kitchen (munin-server)"
+      script:
+        - bundle exec kitchen test munin-server-ubuntu-1804
+    - name: "Test Kitchen (mysql)"
+      script:
+        - bundle exec kitchen test mysql-ubuntu-1804
+    - name: "Test Kitchen (networking)"
+      script:
+        - bundle exec kitchen test networking-ubuntu-1804
+    - name: "Test Kitchen (otrs)"
+      script:
+        - bundle exec kitchen test otrs-ubuntu-1804
+    - name: "Test Kitchen (python)"
+      script:
+        - bundle exec kitchen test python-ubuntu-1804
+    - name: "Test Kitchen (tools)"
+      script:
+        - bundle exec kitchen test tools-ubuntu-1804
-- 
2.43.2