Add freebsd to the test-kitchen build matrix.

sous-chefs · Mar 17, 2016 · 753397b · 753397b
1 parent b25b15e
commit 753397b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 23 deletions.
diff --git a/.kitchen.yml b/.kitchen.yml
@@ -7,17 +7,30 @@ provisioner:
 
 platforms:
   - name: ubuntu-14.04
+    run_list:
+      - recipe[apt::default]
   - name: ubuntu-12.04
+    run_list:
+      - recipe[apt::default]
   - name: centos-7.2
+    run_list:
+      - recipe[yum::default]
   - name: centos-6.7
+    run_list:
+      - recipe[yum::default]
   - name: centos-5.11
+    run_list:
+      - recipe[yum::default]
+  - name: freebsd-10.2
+    run_list:
+      - recipe[freebsd::default]
   - name: windows-2012r2
+    run_list:
+      - recipe[windows::default]
 
 suites:
   - name: default
     run_list:
-      - recipe[apt::default]
-      - recipe[yum::default]
       - recipe[consul::default]
     attributes:
       consul:
@@ -26,12 +39,8 @@ suites:
           server: true
           datacenter: FortMeade
           encrypt: CGXC2NsXW4AvuB4h5ODYzQ==
-    excludes:
-      - windows-2012r2
   - name: git
     run_list:
-      - recipe[apt::default]
-      - recipe[yum::default]
       - recipe[consul::default]
     attributes:
       consul:
@@ -42,8 +51,6 @@ suites:
       - windows-2012r2
   - name: webui
     run_list:
-      - recipe[apt::default]
-      - recipe[yum::default]
       - recipe[consul::default]
     attributes:
       consul:
@@ -53,8 +60,6 @@ suites:
           ui: true
           datacenter: FortMeade
           encrypt: CGXC2NsXW4AvuB4h5ODYzQ==
-    excludes:
-      - windows-2012r2
   - name: acl
     run_list:
       - recipe[consul::default]
@@ -74,16 +79,3 @@ suites:
       - centos-7.2
       - centos-6.7
       - centos-5.11
-  - name: zip
-    includes:
-      - windows-2012r2
-    run_list:
-      - recipe[consul::default]
-    attributes:
-      consul:
-        service_user: vagrant
-        config: *default-config
-        service:
-          nssm_params:
-            AppStdout: C:\foo\bar\out.log
-            AppStderr: C:\foo\bar\err.log
diff --git a/Berksfile b/Berksfile
@@ -4,4 +4,7 @@ metadata
 group :test, :integration do
   cookbook 'consul_spec', path: 'test/cookbooks/consul_spec'
   cookbook 'apt'
+  cookbook 'freebsd'
+  cookbook 'windows'
+  cookbook 'yum'
 end