use new collector attribute and add update kitchen for windows to eas…

…e integration testing

examples/kitchen/.kitchen.linux.yml

@@ -21,6 +21,7 @@ suites:
       - recipe[audit::default]
     attributes:
       audit:
+        collector: 'chef-compliance'
         server: <%= ENV['COMPLIANCE_API'] %>
         token: <%= ENV['COMPLIANCE_ACCESSTOKEN'] %>
         owner: admin

examples/kitchen/.kitchen.win.yml

@@ -12,12 +12,28 @@ verifier:
 platforms:
 - name: windows-2012r2
 
+# The following (private) boxes are shared via Atlas and are only
+# available to users working for Chef. Sorry, it's about software licensing.
+#
+# Chef-internal users, you will need to:
+# 1.  Create an Atlas account:  https://atlas.hashicorp.com/
+# 2.  Ping #eng-services-support with your Atlas account name
+#     to be added to the relevant team in Atlas,
+# 3.  Do `vagrant login` with your Atlas creds so that you can download
+#     the private boxes.
+<% [ '', '-i386' ].each do |win_suffix| %>
+- name: windows-2012r2-standard<%= win_suffix %>
+  driver:
+    box: chef/windows-server-2012r2-standard # private
+<% end %>
+
 suites:
   - name: windows
     run_list:
       - recipe[audit::default]
     attributes:
       audit:
+        collector: 'chef-compliance'
         server: <%= ENV['COMPLIANCE_API'] %>
         token: <%= ENV['COMPLIANCE_ACCESSTOKEN'] %>
         owner: admin

examples/kitchen/Gemfile

@@ -1,7 +1,7 @@
 # encoding: utf-8
 source 'https://rubygems.org'
 
-gem 'berkshelf', '~> 3.3.0'
+gem 'berkshelf', '~> 4.3.5'
 gem 'test-kitchen', '~> 1.6'
 gem 'kitchen-vagrant'
 gem 'kitchen-inspec', '~> 0.9'